aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-02 01:57:30 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-02 01:57:30 +0100
commit1c0be3994382ca355db16a2ab9f54dd99a37f1ec (patch)
tree725c7b2e3ec9f5970fc3b932d7cf3d29e6845717 /version.inc
parent473e582d1f3e5067c1aecee9c9f2f579864db3ef (diff)
parentd507484cc52840e90fbe88568a56e61a183ef455 (diff)
downloadvolse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.gz
volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.tar.bz2
volse-hubzilla-1c0be3994382ca355db16a2ab9f54dd99a37f1ec.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 309a291d2..d8c959b4b 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-08-30.783
+2014-09-01.785