aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2015-09-19 20:11:59 +0200
committerzottel <github@zottel.net>2015-09-19 20:11:59 +0200
commit032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5 (patch)
tree579fecd828a42463c0a2bf2a99ff95e316610201 /version.inc
parent4d05d477f8363aceb08d533c79d048b4e7be1fa3 (diff)
parent63146821d7f28107ca34fbe581dcc3abf6fd49fe (diff)
downloadvolse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.tar.gz
volse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.tar.bz2
volse-hubzilla-032ef0ca3495cf4a1caaf1a6ea8000c17aba0ba5.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 e008faecc..2d7153d51 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-16.1157
+2015-09-18.1159