aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-19 02:59:40 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-19 02:59:40 -0400
commit2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2 (patch)
tree5ab08718ea4230918eeaa17f0d69d07faed082ff /boot.php
parent83f0807e59b5be288374a825d1e4f75869d515de (diff)
parent4133df62234cc3466f34b8a7d52147a1e422bbc0 (diff)
downloadvolse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.tar.gz
volse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.tar.bz2
volse-hubzilla-2cee9ec5c830098b5c57ae0c3d2a3d4e6697bce2.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: profile change activity link bug * master:
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 95f296d41..7174b6822 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', '3.0.1345' );
+define ( 'FRIENDICA_VERSION', '3.0.1346' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1144 );