aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-06-16 14:59:17 +0100
committerThomas Willingham <founder@kakste.com>2013-06-16 14:59:17 +0100
commit33696cc8392daeb08d011aa3b1209f3b121898ea (patch)
tree466d48f5abc1a4ec1dbf83543471a8ac89428516 /version.inc
parent466a6d5227fbaf0a36cd76b5603cb42bb1b7462b (diff)
parentc4c80a2e472173dfed9b982c6705ccfbb6e6cdab (diff)
downloadvolse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.gz
volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.tar.bz2
volse-hubzilla-33696cc8392daeb08d011aa3b1209f3b121898ea.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 6078ba2c4..b47f8837e 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-06-06.336
+2013-06-16.346