Merge branch 'master' into notify

This commit is contained in:
friendica 2011-12-23 22:40:04 -08:00
commit 202725e671

View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1203' );
define ( 'FRIENDICA_VERSION', '2.3.1204' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1112 );