aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorDevlon Duthie <duthied@gmail.com>2011-10-02 18:39:53 -0500
committerDevlon Duthie <duthied@gmail.com>2011-10-02 18:39:53 -0500
commit8e38fe6f47db54e7af12707130641e8de9f3eeb9 (patch)
tree5b2b4fadf9adc716bf7c94dc864c9403007a8c84 /boot.php
parentf6f5e5b99389019bdd6a3258de19cdda2d014b97 (diff)
parent7c1968907d26a66581d362475a6b557e53e159cb (diff)
downloadvolse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.tar.gz
volse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.tar.bz2
volse-hubzilla-8e38fe6f47db54e7af12707130641e8de9f3eeb9.zip
Merge branch 'master' of http://github.com/friendika/Free-Friendika
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 59eeb4643..97a4f96cd 100644
--- a/boot.php
+++ b/boot.php
@@ -8,9 +8,9 @@ require_once("include/pgettext.php");
require_once('include/nav.php');
define ( 'FRIENDIKA_PLATFORM', 'Free Friendika');
-define ( 'FRIENDIKA_VERSION', '2.3.1120' );
+define ( 'FRIENDIKA_VERSION', '2.3.1121' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
-define ( 'DB_UPDATE_VERSION', 1093 );
+define ( 'DB_UPDATE_VERSION', 1094 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );