Merge branch 'master' of git://github.com/friendica/friendica

2012-03-11 11:27:47 +00:00
parent 635958e11d 50863a19eb
commit 4df08433c6
62 changed files with 7164 additions and 561 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1275' );
+define ( 'FRIENDICA_VERSION',      '2.3.1277' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );