aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-03-17 01:49:17 +0100
committerzottel <github@zottel.net>2012-03-17 01:49:17 +0100
commitc56e3c5dd4bcbb949282fd3b4c065ccfd4673726 (patch)
treec4574eae6f2aaf68c50ccc1022944e0e1c45760b /boot.php
parentea4c806c5c3adacb6ef585de657e5f34c2e24c98 (diff)
parent8af36b92bb3a78235f5741c764d034dc66b959b2 (diff)
downloadvolse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.gz
volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.tar.bz2
volse-hubzilla-c56e3c5dd4bcbb949282fd3b4c065ccfd4673726.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 86da3cd2e..322340e5d 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1282' );
+define ( 'FRIENDICA_VERSION', '2.3.1283' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1132 );