diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-09-11 14:33:07 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-11 14:33:07 -0700 |
commit | 45e1f93e564ab539941b3dccfa6b9f5654ff0203 (patch) | |
tree | b912fe877c8ea3d83619c83ee3f774d4c904ca51 /version.inc | |
parent | 77807d439ec964df295d29b33455849c9a11dc92 (diff) | |
parent | e062c4e6b54c6162d118f8657eb6f81c971f0dd8 (diff) | |
download | volse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.tar.gz volse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.tar.bz2 volse-hubzilla-45e1f93e564ab539941b3dccfa6b9f5654ff0203.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
util/messages.po
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 763c01a75..95854c9ac 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-10.1151 +2015-09-11.1152 |