aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-02 21:58:28 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-02 21:58:28 -0700
commit1a5898bf80246fca87ecd7a56f9b7e4780e4089c (patch)
tree7f80261ecac578fe8cedd1b32c591d37eda86dd8 /version.inc
parent8b2b92fe3267af0b7f3fea33940a440c847c84f2 (diff)
parent54301a9ff518224309664cd8c2f23cba0d30cb2d (diff)
downloadvolse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.gz
volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.tar.bz2
volse-hubzilla-1a5898bf80246fca87ecd7a56f9b7e4780e4089c.zip
sync abook entries from redmatrix
Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.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 14dff2773..e512ec77c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-06-29.1078
+2015-07-01.1080