aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-11 07:26:15 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-11 07:26:15 +0100
commit609e42cdd8facae0a673bb1a370c44225d22b1cd (patch)
treef805a273056c4363c2c084999ac7cc02f9f3a16b /version.inc
parent23d30ab2c5ecb5275f43cd59cf3f0ea93e05c028 (diff)
parent7235c208541c9797963b6cd364bdb61b608c06e3 (diff)
downloadvolse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.tar.gz
volse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.tar.bz2
volse-hubzilla-609e42cdd8facae0a673bb1a370c44225d22b1cd.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/version.inc b/version.inc
index 11ca984f2..c4168039b 100644
--- a/version.inc
+++ b/version.inc
@@ -1,2 +1 @@
-2015-11-09.1211
-
+2015-11-10.1212