aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-10 13:26:44 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-10 13:26:44 -0700
commit0a644a2f416e8e4a93df6b9e0a4497071ead4b56 (patch)
tree1b01f2363c54e086224b6f9f7ad6b2d41feed255 /version.inc
parent37a63365f1143375a2382a26ad9b07048b9570a6 (diff)
parent2cb8b19972eb6a023eca1297f281ef9f68934c64 (diff)
downloadvolse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.tar.gz
volse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.tar.bz2
volse-hubzilla-0a644a2f416e8e4a93df6b9e0a4497071ead4b56.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index 438fb54f0..387119390 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-05.1023
+2015-05-10.1028