aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2014-01-15 23:01:02 +0000
committerThomas Willingham <founder@kakste.com>2014-01-15 23:01:02 +0000
commit9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00 (patch)
treec4b261f1cbbf85d4153ecee64fe285cc5aa38ec9 /version.inc
parent9addc83520adada78ad339edd6abe666f65b7059 (diff)
parent762a5432494711bf481943a0dee72cf65f7a04bb (diff)
downloadvolse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.tar.gz
volse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.tar.bz2
volse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.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 6f37c44ab..8bc3bd5a8 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-01-11.554
+2014-01-15.558