aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-29 18:01:51 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-29 18:01:51 -0700
commit6e8ad5089e3aeea6377718db91ccf48284a315fa (patch)
tree41cfeac8c0e80a135bdb10e9631519b8b2dd3225 /version.inc
parent63f2e9b41259975f1af6415cda01dc0f81b1af30 (diff)
parent2072ea721fa26b8e5f7dd4067434951b738de92b (diff)
downloadvolse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.gz
volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.tar.bz2
volse-hubzilla-6e8ad5089e3aeea6377718db91ccf48284a315fa.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: view/nl/messages.po view/nl/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 b06ac504d..14dff2773 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-06-28.1077
+2015-06-29.1078