aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-06-07 03:46:43 +0100
committerThomas Willingham <founder@kakste.com>2013-06-07 03:46:43 +0100
commit466a6d5227fbaf0a36cd76b5603cb42bb1b7462b (patch)
tree395936a63e27fa105e0dc69d13c1b951dc9e9439 /version.inc
parentdc6472e046ee6ac0afc934e8ad1edc1e281a3cb0 (diff)
parentc21f8c68e39e22a0348e5717109f0005d4d35809 (diff)
downloadvolse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.tar.gz
volse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.tar.bz2
volse-hubzilla-466a6d5227fbaf0a36cd76b5603cb42bb1b7462b.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 dcc286868..6078ba2c4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-05-29.328
+2013-06-06.336