aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-07 03:10:09 -0400
commitbc69a957dc875b699240827cb4af2691f8a8fcd6 (patch)
tree28442b76b1c8fec40235445d62b01c182f770b5f /boot.php
parent43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (diff)
parentecabe1d505464577fdc3d3ff0090371c8ca0cf1e (diff)
downloadvolse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.gz
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.bz2
volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: ignore removed plugins fix messed up config tables w/ duplicate entries small fixes for the German strings fix bad sql update revert config changes, we're getting duplicate keys new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... * 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 e1bcc078a..1bc4c2a9a 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1303' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
-define ( 'DB_UPDATE_VERSION', 1135 );
+define ( 'DB_UPDATE_VERSION', 1137 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );