aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-25 19:14:45 -0800
committerfriendica <info@friendica.com>2011-12-25 19:14:45 -0800
commit205dcd8f5bd01feedd8877581876ec7253b4c15a (patch)
tree208bbdb1a877b07bd7a88f9a78da7bcadadfc364 /boot.php
parent170b8418342fc8bd614478dd673691384e411da2 (diff)
parent629a69f9dc96ceefeedb72927ed87ba26deac451 (diff)
downloadvolse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.tar.gz
volse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.tar.bz2
volse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.zip
Merge branch 'master' into notify
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 7c60c11ad..354b51a94 100644
--- 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.1204' );
+define ( 'FRIENDICA_VERSION', '2.3.1206' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1112 );