aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 01:52:11 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 01:52:11 +0100
commit545dc5cf65fef823a9ca8a5bcde6e346d4503d4c (patch)
tree91a1e3e32cef9019ffbb5aeebe42197a1616bc3e /version.inc
parentc545ada746a384988172ea1ce28d43dd4ac276b3 (diff)
parenta089064588352b60bebf27c94a51d480f8062368 (diff)
downloadvolse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.gz
volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.tar.bz2
volse-hubzilla-545dc5cf65fef823a9ca8a5bcde6e346d4503d4c.zip
Merge remote-tracking branch 'upstream/master'
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 1cf2edada..b6659c788 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-16.1218
+2015-11-17.1219