aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-15 16:02:37 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-15 16:02:37 -0700
commit7517c76ae48ddad741fe61c41dd6dcc09421d160 (patch)
treee4030f6419432e8644a4897a38703559a4ba1889 /install
parentbf5a1f662a4f00e8376613fa387c843d539c7433 (diff)
parente26f771cbe5717f9db9c5dde897f1f6e79b3a932 (diff)
downloadvolse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.tar.gz
volse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.tar.bz2
volse-hubzilla-7517c76ae48ddad741fe61c41dd6dcc09421d160.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: install/update.php
Diffstat (limited to 'install')
-rw-r--r--install/update.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/install/update.php b/install/update.php
index ace5239b5..e120f91d2 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1156 );
+define( 'UPDATE_VERSION' , 1157 );
/**
*
@@ -1885,3 +1885,8 @@ function update_r1155() {
return UPDATE_FAILED;
}
+
+function update_r1156() {
+ return UPDATE_SUCCESS;
+}
+