aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-17 11:26:18 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-17 11:26:18 +0100
commit256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6 (patch)
tree1f6778002328b27066ba86910f3f87bd060d6660 /version.inc
parentaf8449cef83376c65ff5ae9092dbe69f89294e69 (diff)
parent9b3b2efe9aa374565c0c67bbc67c36f9c99d3add (diff)
downloadvolse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.gz
volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.tar.bz2
volse-hubzilla-256472f9eb3a1c929e5b43e2b6eb3bf0b0d5afe6.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 e854f1c97..84bd44ea2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-15.1279H
+2016-01-17.1281H