aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-01 00:35:01 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-12-01 00:35:01 +0100
commitb96f09bb3aeee403038755ab5f6e6b53654cb145 (patch)
treeca72f5712b7467e7f968f87172cec82164435894 /version.inc
parent519862115c143cf3f645a172f39e5a0b4dc9d5bb (diff)
parent4b191fb55860c5f366c17ecaacc59ccbdd936885 (diff)
downloadvolse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.tar.gz
volse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.tar.bz2
volse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.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 ed529cb60..936c9fe07 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-28.1230
+2015-11-30.1232