1
1
Fork 0

Merge branch 'pull'

This commit is contained in:
friendica 2012-04-05 21:43:38 -07:00
commit 4bee1859be
1503 changed files with 187 additions and 166 deletions

2
boot.php Executable file → Normal file
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1303' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1134 );
define ( 'DB_UPDATE_VERSION', 1135 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );