aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-10-27 01:12:09 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-10-27 01:12:09 +0100
commita2931cd17ddf4f10205f656a6c0df01ebf459668 (patch)
tree98558fdd5af3dcb1c537a32373413d8cee489cf9
parentfc65496d1dffd74aba1d2f7ec62cfcc398a96114 (diff)
parentbe98466b0dd814b7c20c1ab68bc2f3ef34ed282c (diff)
downloadvolse-hubzilla-a2931cd17ddf4f10205f656a6c0df01ebf459668.tar.gz
volse-hubzilla-a2931cd17ddf4f10205f656a6c0df01ebf459668.tar.bz2
volse-hubzilla-a2931cd17ddf4f10205f656a6c0df01ebf459668.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index a451b30bc..ad916e0f3 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-10-25.1196
+2015-10-26.1197