aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-28 02:30:20 +0200
committerzottel <github@zottel.net>2012-04-28 02:30:20 +0200
commit43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (patch)
treef23edf82793ede551df581a36f8bc2370770c092 /boot.php
parentedc7e571b710d0ce24587c529d6e51ee7781d638 (diff)
parentc3f70a9e56151b8594b3485cc8b12e4d26ac6773 (diff)
downloadvolse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.gz
volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.tar.bz2
volse-hubzilla-43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720.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 b8a61c796..02550deb1 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.1324' );
+define ( 'FRIENDICA_VERSION', '2.3.1325' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1138 );
+define ( 'DB_UPDATE_VERSION', 1139 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );