aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-18 20:33:25 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-02-18 20:33:25 +0100
commitcc264b2d60049a844fe17322fbcb367712a7071f (patch)
treef1f069a49dd186d4cf21c37a25fb794d6d53e6f2 /version.inc
parentb77c5ae61e5a208daf4b9431a730db874c487e32 (diff)
parent33c34984e647f48452d53b93b635f6f517a0f392 (diff)
downloadvolse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.gz
volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.tar.bz2
volse-hubzilla-cc264b2d60049a844fe17322fbcb367712a7071f.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 86359b809..830cdcca5 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-12.1307H
+2016-02-17.1312H