aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2015-09-29 12:40:24 +0200
committerzottel <github@zottel.net>2015-09-29 12:40:24 +0200
commitf950d27b3debfe08e022a477dbfb4fac101106e4 (patch)
tree38f62f0828163715c634e17290e2d77eb29d1b32 /version.inc
parent8e410f14b1b5b23e4c7e41d4902ac7b9cb529c1b (diff)
parent2a2da48d1871f408232a8397632f06528c8b43ae (diff)
downloadvolse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.gz
volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.tar.bz2
volse-hubzilla-f950d27b3debfe08e022a477dbfb4fac101106e4.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 e621e16cb..80d66264c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-23.1164
+2015-09-28.1169