diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-23 22:33:48 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-23 22:33:48 -0700 |
| commit | e04f04ef0f79d938576668c57d7240d376155a8a (patch) | |
| tree | 21382406c34ff3adf8e866fdcf5be39a8f2a72e3 | |
| parent | 0f3c2c4b2448694da4f0b350c1814fb5df973ce9 (diff) | |
| parent | 8a94a4938fb85baca4a8104cbf6802a59459d17e (diff) | |
| download | volse-hubzilla-e04f04ef0f79d938576668c57d7240d376155a8a.tar.gz volse-hubzilla-e04f04ef0f79d938576668c57d7240d376155a8a.tar.bz2 volse-hubzilla-e04f04ef0f79d938576668c57d7240d376155a8a.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
install/update.php
| -rw-r--r-- | install/update.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/install/update.php b/install/update.php index 500a89fc0..9f4457600 100644 --- a/install/update.php +++ b/install/update.php @@ -1873,4 +1873,5 @@ function update_r1154() { return UPDATE_SUCCESS; return UPDATE_FAILED; -}
\ No newline at end of file +} + diff --git a/version.inc b/version.inc index 3b70e98ac..e621e16cb 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-22.1163 +2015-09-23.1164 |