aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-05-19 17:36:11 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-05-19 17:36:11 -0700
commitc78869e437eecfe7e30f728c3726341b60fe7803 (patch)
treee5c0585d5093ffd270dde4cc15855bbbbab91a5b /version.inc
parent77e2ef45f05b8106ebe5400f8931c6e54ec6341b (diff)
parente54198e5b8c0534a9021f4a494cf6fa504fc72ac (diff)
downloadvolse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.tar.gz
volse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.tar.bz2
volse-hubzilla-c78869e437eecfe7e30f728c3726341b60fe7803.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 36c8ec9e8..acb250bd9 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-05-18.1036
+2015-05-19.1037