aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
commitcb05801a9031254f5882038de07a3ee4d5f89dd0 (patch)
tree186d9d1a4c591ec23e0e5bbebd08301143b5c157 /boot.php
parent7308dbae282194356c2e95936aecc15ea059f356 (diff)
parent0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff)
downloadvolse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip
Merge commit 'upstream/master'
Diffstat (limited to 'boot.php')
-rw-r--r--[-rwxr-xr-x]boot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index c0aa9ba82..576cad6b6 100755..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.1302' );
+define ( 'FRIENDICA_VERSION', '2.3.1304' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1134 );
+define ( 'DB_UPDATE_VERSION', 1137 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );