aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-22 19:02:20 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-22 19:02:20 +0200
commitd7c9f2ccba1f0a19c3b60281589ab7dd611c744b (patch)
tree9cf73bfaed9b8ad3c7c3239ce2b8e1baa57c9b62 /version.inc
parentcbd7f8906674f6373f0dc6a8f79ecfcd4ce4bd8d (diff)
parent7dd61c05dcf169807aed91d305ea235bcaa9035e (diff)
downloadvolse-hubzilla-d7c9f2ccba1f0a19c3b60281589ab7dd611c744b.tar.gz
volse-hubzilla-d7c9f2ccba1f0a19c3b60281589ab7dd611c744b.tar.bz2
volse-hubzilla-d7c9f2ccba1f0a19c3b60281589ab7dd611c744b.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 ecb05b628..3b70e98ac 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-21.1162
+2015-09-22.1163