aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-16 06:42:08 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-16 06:42:08 +0100
commit69487389d362285aeeb5106097864ec982c08a59 (patch)
treef5eede7c0a6a5ade0b097b6646f8de2cb33ba5e5 /version.inc
parentfd5d1416d9a65206879588ff195a8e1d3b49c008 (diff)
parent0cb5f009b483ff570ded4570bb45023573531494 (diff)
downloadvolse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.gz
volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.tar.bz2
volse-hubzilla-69487389d362285aeeb5106097864ec982c08a59.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 1c628f631..e9eed26db 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-13.1215
+2015-11-15.1217