aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-30 17:12:23 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-30 17:12:23 -0700
commit26411ab385f77b2edaa5edd4b33fbaff60789fd4 (patch)
treed7b878a8813b7f815633ad22dc4f63c752f9a730
parentd5a40cac25e1bcc936a4010ec0038f8e5143c0a0 (diff)
parent4c6368d0750650ac2281d5a1b1831ca9d5b00501 (diff)
downloadvolse-hubzilla-26411ab385f77b2edaa5edd4b33fbaff60789fd4.tar.gz
volse-hubzilla-26411ab385f77b2edaa5edd4b33fbaff60789fd4.tar.bz2
volse-hubzilla-26411ab385f77b2edaa5edd4b33fbaff60789fd4.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rwxr-xr-xboot.php2
-rw-r--r--install/update.php7
-rw-r--r--version.inc2
3 files changed, 8 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index ff6eeccf8..dd1f7bc1b 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', 1144 );
+define ( 'DB_UPDATE_VERSION', 1145 );
/**
* @brief Constant with a HTML line break.
diff --git a/install/update.php b/install/update.php
index fb49e9a16..0f9ec4c79 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1144 );
+define( 'UPDATE_VERSION' , 1145 );
/**
*
@@ -1666,4 +1666,9 @@ function update_r1143() {
return UPDATE_SUCCESS;
return UPDATE_FAILED;
+}
+
+function update_r1144() {
+ // hubzilla update does not apply here, but we're keeping the numbers in sync
+ return UPDATE_SUCCESS;
} \ No newline at end of file
diff --git a/version.inc b/version.inc
index 3a20d2696..110ed7a67 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-29.1108
+2015-07-30.1109