aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-12-09 01:39:20 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-12-09 01:39:20 +0100
commit60b0f9af909b6f944edd913cb96915cc8c3b7ec3 (patch)
tree0df872d85d24118cce12a1a1b0cb1e7bfc4f3adb /version.inc
parent9d04406f9ae8a91f8ec5f3be7f89471ac5605522 (diff)
parent29ac533cc908a57115d52a8659bce348b36ae6fa (diff)
downloadvolse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.tar.gz
volse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.tar.bz2
volse-hubzilla-60b0f9af909b6f944edd913cb96915cc8c3b7ec3.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
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 97ba9c359..2d04a5143 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-07.1239
+2015-12-08.1240