aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-07 07:13:33 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-07 07:13:33 +0100
commitce4bb8e5ecd502ba8420dea93256ba4fbebf49ff (patch)
tree924b094d38bd32fae2af56976e12ab5f38541037 /version.inc
parentc40f6060da9c014135e70f165fa7adbfb127bcf2 (diff)
parent81544538032500c05a14fc90902e2930b1c4b03a (diff)
downloadvolse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.tar.gz
volse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.tar.bz2
volse-hubzilla-ce4bb8e5ecd502ba8420dea93256ba4fbebf49ff.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 b1085e3d5..30304c72c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-05.1207
+2015-11-06.1208