aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-03-22 14:56:23 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-03-22 14:56:23 +0100
commitd5a6e7b1767ebc337f31745984f1ce0904b77780 (patch)
tree29355722fb8a3e993884e852a254277c80e90de4 /boot.php
parente193091dfe348c5430c3a303947dbe7a6eced374 (diff)
parent622b25df5f2d1ab21c9e23047bc0c98bfe72bad0 (diff)
downloadvolse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.gz
volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.tar.bz2
volse-hubzilla-d5a6e7b1767ebc337f31745984f1ce0904b77780.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 9779bb9a8..04e16e64d 100755
--- 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.1285' );
+define ( 'FRIENDICA_VERSION', '2.3.1288' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1132 );
+define ( 'DB_UPDATE_VERSION', 1133 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );