diff options
author | Meitar Moscovitz <meitarm@gmail.com> | 2009-02-18 13:01:52 +1100 |
---|---|---|
committer | Meitar Moscovitz <meitarm@gmail.com> | 2009-02-18 13:01:52 +1100 |
commit | cca1d777485d9b5f41bbc65ad10b002702f0aae4 (patch) | |
tree | 1a498462a0d98d4f89a55f548099abd5401dc538 /lib/common.php | |
parent | 9d81cef5cc2a0a197a0223206ba3d9a687065886 (diff) | |
parent | 6fb3923cef0699a05b336f35505637485f16157e (diff) |
Merge branch 'dev-0.7.x' into framebusting
Conflicts:
lib/action.php
Diffstat (limited to 'lib/common.php')
-rw-r--r-- | lib/common.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php index 7bfd14c42..4fc749ca0 100644 --- a/lib/common.php +++ b/lib/common.php @@ -106,7 +106,8 @@ $config = array('server' => null), 'public' => array('localonly' => true, - 'blacklist' => array()), + 'blacklist' => array(), + 'autosource' => array()), 'theme' => array('server' => null), 'throttle' => |