aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 16:48:56 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-18 16:48:56 +0100
commit33258803ea0c14d5037f2b5a4f23b424fe1aa301 (patch)
treea6f5faad7070aeb0c81f5420094795225736362e /version.inc
parent0d232c612b71ba28dba234415185ecfb45a80695 (diff)
parent179730e4851bfb26151502d4473231df86b9c8df (diff)
downloadvolse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.tar.gz
volse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.tar.bz2
volse-hubzilla-33258803ea0c14d5037f2b5a4f23b424fe1aa301.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 b6659c788..a1de68ee0 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-17.1219
+2015-11-18.1220