aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-22 02:34:05 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-22 02:34:05 -0700
commit2b07a69b93cdd3c1c4296d0b994e48069890595b (patch)
treee968d475e880ca601d18c3e0ed16ff6d85b1cdcf
parent0b1b11ea53ee3fd466eb338ac5ce67e62af87413 (diff)
parent5068ce05693d3bb52e049156eb7900cbe55ff650 (diff)
downloadvolse-hubzilla-2b07a69b93cdd3c1c4296d0b994e48069890595b.tar.gz
volse-hubzilla-2b07a69b93cdd3c1c4296d0b994e48069890595b.tar.bz2
volse-hubzilla-2b07a69b93cdd3c1c4296d0b994e48069890595b.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--install/update.php4
-rw-r--r--version.inc2
2 files changed, 5 insertions, 1 deletions
diff --git a/install/update.php b/install/update.php
index bef754570..f4ef0d4c3 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1865,3 +1865,7 @@ function update_r1153() {
}
+
+function update_r1153() {
+ return UPDATE_SUCCESS;
+}
diff --git a/version.inc b/version.inc
index ecb05b628..3b70e98ac 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-21.1162
+2015-09-22.1163