aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-11-15 16:00:40 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-11-15 16:00:40 +0100
commitae43a96d70d0cda4238de6e50d940a9cb36c15ef (patch)
tree584b4981efe21ef3f8b1aed7b307bcecac121198
parent8e588b530ffd6ef0f20425d19152e6288c9ad6b6 (diff)
parentd23452db2ba6bf11e2b9445bd8191aec8c22253a (diff)
downloadvolse-hubzilla-ae43a96d70d0cda4238de6e50d940a9cb36c15ef.tar.gz
volse-hubzilla-ae43a96d70d0cda4238de6e50d940a9cb36c15ef.tar.bz2
volse-hubzilla-ae43a96d70d0cda4238de6e50d940a9cb36c15ef.zip
Merge remote-tracking branch 'friendica/master'
-rw-r--r--boot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 3e18db065..b11092256 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDIKA_PLATFORM', 'Friendica');
-define ( 'FRIENDIKA_VERSION', '2.3.1164' );
+define ( 'FRIENDIKA_VERSION', '2.3.1165' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1103 );