aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-25 06:05:12 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-25 06:05:12 +0100
commit21f2df399d3e21b6322ece16717efe88bcc21621 (patch)
tree1f6bcf44e803c1ef723b546eb4fcd83dc5f82e87 /version.inc
parentddeab48f9b314eed067c31086945acee33964d37 (diff)
parent43521bb10b71752b5b3fd953056966ba30df50b6 (diff)
downloadvolse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.tar.gz
volse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.tar.bz2
volse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.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 06b5d04b1..2d59eb514 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-22.1315H
+2016-02-24.1317H