aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-11 17:56:56 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-11 17:56:56 -0700
commit5733491ac853b4af5d4829d68e870f3d82ced3c8 (patch)
treee90b5ee0f46e37e239cf9df51e6e45adf7b7d454 /version.inc
parent8812f183a288fa3da960c5b91107315080ecec1e (diff)
parentbc8840eab5298aef6902ac0751adf91df5232188 (diff)
downloadvolse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.tar.gz
volse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.tar.bz2
volse-hubzilla-5733491ac853b4af5d4829d68e870f3d82ced3c8.zip
more work on items
and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/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 273ae533b..aa34c32c5 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-06-10.1059
+2015-06-11.1060