aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-22 20:45:31 +0000
committerThomas Willingham <founder@kakste.com>2013-12-22 20:45:31 +0000
commit3502a2e86b1d4924fea3b0eac6c3ce499eea2f16 (patch)
tree823970af414e5c17ca660fc9cb8d5e6fefa8356d /version.inc
parent7ac00d02d110ec2f2d33779d8316e17c13cda149 (diff)
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
downloadvolse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.gz
volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.bz2
volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.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 50e01fa2c..4aa1ec592 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-12-17.530
+2013-12-22.534