aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-28 19:06:31 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-28 19:06:31 -0700
commit8fe3daab21f9aba00f7def3553247b0cbcf5f94a (patch)
tree3e8b22ef3b197e4dbdba3e86f7427452d1cd6b73 /boot.php
parentb381ec57346a6d7724b2317c120ce2e6e70edc37 (diff)
parentdf5223fe9813a2f6bee053c1c3c6acbdbaf6d42f (diff)
downloadvolse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.gz
volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.bz2
volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php
Diffstat (limited to 'boot.php')
-rwxr-xr-xboot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 6d97764a1..ed84f3ab8 100755
--- a/boot.php
+++ b/boot.php
@@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1141 );
+define ( 'DB_UPDATE_VERSION', 1142 );
/**
* @brief Constant with a HTML line break.