diff options
author | Evan Prodromou <evan@status.net> | 2010-11-14 06:49:43 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-11-14 06:49:43 -0500 |
commit | 01f32e3998b8d031d2a39e2d0506253142b6632e (patch) | |
tree | 952174eeb2fa746c97b9884cf4797ffa3f9870ce /lib/statusnet.php | |
parent | c4b8f68a1a3ed6422a2ed1cb7a8b5b5c65011b5f (diff) | |
parent | b716d01a41c54c06676a1e54a48c36e05755a247 (diff) |
Merge remote branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
actions/urlsettings.php
Diffstat (limited to 'lib/statusnet.php')
-rw-r--r-- | lib/statusnet.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/statusnet.php b/lib/statusnet.php index 2e2359c28..d94d856c9 100644 --- a/lib/statusnet.php +++ b/lib/statusnet.php @@ -245,7 +245,7 @@ class StatusNet * Establish default configuration based on given or default server and path * Sets global $_server, $_path, and $config */ - protected static function initDefaults($server, $path) + public static function initDefaults($server, $path) { global $_server, $_path, $config; |