aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-08-26 14:44:24 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-08-26 14:44:24 +0200
commit5ec4a4e6deb5d28cbfab54093f8b4180912738d4 (patch)
tree653cb4738734d9f20bd1457c419105dcf235edea /boot.php
parent97806544bcd7ee3831ffc515062afe0812828b76 (diff)
parent1861dc1fae549a0ee2b6287d4f7dc7f8797f5070 (diff)
downloadvolse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.gz
volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.tar.bz2
volse-hubzilla-5ec4a4e6deb5d28cbfab54093f8b4180912738d4.zip
Merge remote-tracking branch 'friendika/master' into newui
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 bfdae47be..28467006d 100644
--- a/boot.php
+++ b/boot.php
@@ -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' );