aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 06:27:46 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-20 06:27:46 +0100
commit22f6687f44c4fc6bc1938ea434a5c7a665a53127 (patch)
treeff02d6830e37c1082afc8b957e0099dc56da9f19 /version.inc
parent059886a1e493451dffddb0fd863cb002930eae9b (diff)
parente56633d5b0009fd5430a15fd09633e8f43bdb7dd (diff)
downloadvolse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.gz
volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.tar.bz2
volse-hubzilla-22f6687f44c4fc6bc1938ea434a5c7a665a53127.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 369ed3cb7..d6100d73a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-18.1221
+2015-11-19.1221