aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2014-06-04 14:00:08 +0000
committerjeroenpraat <jeroenpraat@xs4all.nl>2014-06-04 14:00:08 +0000
commitd9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2 (patch)
treecd0a06052eb398d0401ca61314d9db8a6ce91599 /version.inc
parent5869836180d8721363294c5d8dbe64d6b54571c6 (diff)
parentd84f03d59b4b3f625b36852211698f5606b6b37c (diff)
downloadvolse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.tar.gz
volse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.tar.bz2
volse-hubzilla-d9688e5ab3bb1c33e432a14ac3455ecb7ca3a6b2.zip
Merge branch 'master' of https://github.com/friendica/red
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 8ff524f4f..1bedfc22b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-06-02.694
+2014-06-04.696