diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 17:53:43 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 17:53:43 -0700 |
commit | b28d3015fe5d65858736177e306f17543a629fc0 (patch) | |
tree | e023ca65dfe3fbec34c78b70fd51dfa28d5ba03c /version.inc | |
parent | 75d521d42affbafa34e87752deeb1961367de1d5 (diff) | |
parent | 1ebaacfd5e7e481cbc025842e78161f79f5d7cce (diff) | |
download | volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.tar.gz volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.tar.bz2 volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.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 89a33f525..5842b45a1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-07.1148 +2015-09-08.1149 |