Merge remote-tracking branch 'friendika/master' into newui

This commit is contained in:
fabrixxm 2011-09-08 20:15:27 +02:00
commit d284f8017c
20 changed files with 5733 additions and 45 deletions

View file

@ -8,7 +8,7 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_VERSION', '2.2.1093' );
define ( 'FRIENDIKA_VERSION', '2.2.1096' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1087 );