aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-17 04:31:20 -0700
committerredmatrix <git@macgirvin.com>2016-04-17 04:31:20 -0700
commitc366bbaa54973239fbecdd2cbc3116343d7ca55a (patch)
treed6586475b1be77b956c759dfd0f166b3d65fad5c
parent08a651dc9dd3b37e0167f3f2ab378cbd161aa09c (diff)
parent72e7c50968d29ead1436b8553824cc65c45cce56 (diff)
downloadvolse-hubzilla-c366bbaa54973239fbecdd2cbc3116343d7ca55a.tar.gz
volse-hubzilla-c366bbaa54973239fbecdd2cbc3116343d7ca55a.tar.bz2
volse-hubzilla-c366bbaa54973239fbecdd2cbc3116343d7ca55a.zip
Merge branch 'master' into dev
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index 352c7a185..a76a05521 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-04-16.1368H
+2016-04-17.1369H