aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-17 16:49:11 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-17 16:49:11 +0100
commitc545ada746a384988172ea1ce28d43dd4ac276b3 (patch)
treee7382c559927dbe39b9b175f827bbe9efab7b5db /version.inc
parent69487389d362285aeeb5106097864ec982c08a59 (diff)
parent868a0d8a90c5e582bb783247fbf3a26f5226b126 (diff)
downloadvolse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.tar.gz
volse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.tar.bz2
volse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.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 e9eed26db..1cf2edada 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-15.1217
+2015-11-16.1218