aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-24 23:32:18 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-24 23:32:18 +0200
commit414b5ea6f3ad616c5211b0e9d4b811c149decf26 (patch)
tree58d7a19079cc1c7de0790b0e2f3b829967344ea1 /version.inc
parent8cbccb20ef7f1fa82c4a16c6c786d5d748901c02 (diff)
parentc42dcd5ac9c63cd42c7af1b2765dd33e7e9f5d6d (diff)
downloadvolse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.tar.gz
volse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.tar.bz2
volse-hubzilla-414b5ea6f3ad616c5211b0e9d4b811c149decf26.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 3b70e98ac..e621e16cb 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-22.1163
+2015-09-23.1164