diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-19 22:48:22 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-19 22:48:22 -0700 |
| commit | ce064188c6d26b7c3b331d1d163988af70e3f2b9 (patch) | |
| tree | 19bc8e19b885371b12f82adab8b66ea547761488 /version.inc | |
| parent | 5d6f59a598fdf700b90d7d14bb5c9087c0968cb9 (diff) | |
| parent | f4a4cf140268db48fa5fb49d10e7149b3fb7c4cf (diff) | |
| download | volse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.tar.gz volse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.tar.bz2 volse-hubzilla-ce064188c6d26b7c3b331d1d163988af70e3f2b9.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
Diffstat (limited to 'version.inc')
| -rw-r--r-- | version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc index 2d7153d51..4a93ab93e 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-18.1159 +2015-09-19.1160 |