GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into testing

Browse Source 
Conflicts:
	plugins/Event/RSVP.php
This commit is contained in:
Evan Prodromou
2011-04-05 13:16:28 -04:00
parent 69bb30e09c 7533c7cfe1
commit 36b331d469
1703 changed files with 92273 additions and 26282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/framework.php
View File

@@ -48,7 +48,7 @@ define('NOTICE_INBOX_SOURCE_REPLY', 3);
define('NOTICE_INBOX_SOURCE_FORWARD', 4);
define('NOTICE_INBOX_SOURCE_GATEWAY', -1);
# append our extlib dir as the last-resort place to find libs
// append our extlib dir as the last-resort place to find libs
set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
@@ -69,7 +69,7 @@ if (!function_exists('dl')) {
}
}
# global configuration object
// global configuration object
require_once('PEAR.php');
require_once('PEAR/Exception.php');