aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-02 08:11:52 +0200
committerzottel <github@zottel.net>2012-05-02 08:11:52 +0200
commit6000e7f30d1193dada903eaf0e6f44149a3dde33 (patch)
tree9b9f482f611b6dd91866518387b79140c6567be7 /boot.php
parent2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (diff)
parentbecdb1f5085f2561b8b0acebbdbf43e4a81d50da (diff)
downloadvolse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.tar.gz
volse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.tar.bz2
volse-hubzilla-6000e7f30d1193dada903eaf0e6f44149a3dde33.zip
Merge remote branch 'upstream/master'
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 44a8d8c32..e1687030d 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1328' );
+define ( 'FRIENDICA_VERSION', '2.3.1329' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1141 );
+define ( 'DB_UPDATE_VERSION', 1142 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );