aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-24 17:44:27 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-24 17:44:27 +0100
commitddeab48f9b314eed067c31086945acee33964d37 (patch)
treea814d6244991017af57ea03670d45d9ca1286cc0 /version.inc
parentcc264b2d60049a844fe17322fbcb367712a7071f (diff)
parent039eb585240a5fa106ede00a055036458a4f5393 (diff)
downloadvolse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.gz
volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.tar.bz2
volse-hubzilla-ddeab48f9b314eed067c31086945acee33964d37.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 830cdcca5..06b5d04b1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-17.1312H
+2016-02-22.1315H