aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-01 21:48:40 -0800
committerfriendica <info@friendica.com>2015-01-01 21:48:40 -0800
commit9a34e18319301e0a952f674899aeb58b424637a4 (patch)
tree021167ff7e50b745b746dbfc6e6a490122597902
parent0a18ea58c692bfb7c5e8e692fd9c180e2148f557 (diff)
parent0286c5a35b7f6fb0f02e50110deb78ae66a028cf (diff)
downloadvolse-hubzilla-9a34e18319301e0a952f674899aeb58b424637a4.tar.gz
volse-hubzilla-9a34e18319301e0a952f674899aeb58b424637a4.tar.bz2
volse-hubzilla-9a34e18319301e0a952f674899aeb58b424637a4.zip
Merge branch 'master' into trinidad
-rw-r--r--version.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index 1e16c4f7e..5bcf774f4 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-12-29.904
+2015-01-01.906