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

This commit is contained in:
fabrixxm
2011-08-26 14:44:24 +02:00
37 changed files with 3736 additions and 775 deletions

View File

@@ -8,9 +8,9 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_VERSION', '2.2.1079' );
define ( 'FRIENDIKA_VERSION', '2.2.1083' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1081 );
define ( 'DB_UPDATE_VERSION', 1082 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );