Merge git://github.com/friendica/friendica

This commit is contained in:
Zvi ben Yaakov (a.k.a rdc) 2012-06-19 23:29:24 +03:00
commit d20cdf09ea
13 changed files with 1254 additions and 661 deletions

View file

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1377' );
define ( 'FRIENDICA_VERSION', '3.0.1378' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1149 );