aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-22 19:15:46 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-22 19:15:46 +0100
commit0d119d83b0a98b2cdd31a01901bbe53374d4e467 (patch)
tree5cb387c1e8981997f626a4096b971f1bdc299f85 /version.inc
parentb0d5b9fd2c5d5f8eb5a58b36f62dc20d6fa214b3 (diff)
parent945689d01c52871293c921329864ce3c5c7dece2 (diff)
downloadvolse-hubzilla-0d119d83b0a98b2cdd31a01901bbe53374d4e467.tar.gz
volse-hubzilla-0d119d83b0a98b2cdd31a01901bbe53374d4e467.tar.bz2
volse-hubzilla-0d119d83b0a98b2cdd31a01901bbe53374d4e467.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 2e8e8f4ff..e558e2de2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-01-21.1285H
+2016-01-22.1286H