aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-14 08:32:37 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-14 08:32:37 +0100
commit6bdde985ce76fe768046cbb0d368c382925b027d (patch)
tree133bcec2650f68ba3be894cbf55596696ee8b2e9 /version.inc
parent9d6a4c1d0530f727aa41c940f826a2d621babe0b (diff)
parentdba38821bc5f3ad9b3a8f4f614d651e98f0b5ec5 (diff)
downloadvolse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.tar.gz
volse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.tar.bz2
volse-hubzilla-6bdde985ce76fe768046cbb0d368c382925b027d.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 938250e5c..1c628f631 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-12.1214
+2015-11-13.1215