diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-14 18:55:43 +0100 |
commit | 3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af (patch) | |
tree | 84b87fb47a27035afd2a354d11c36e8259f4c18e /version.inc | |
parent | 565126a888d70dce853a2351b698bbc0695f0ba9 (diff) | |
parent | dcf7946673fd57325fc848df8f8cea7a84cc35b6 (diff) | |
download | volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.gz volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.tar.bz2 volse-hubzilla-3b1ab5e79cbbf2a8f65cb4dc388e2257a3e857af.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'version.inc')
-rw-r--r-- | version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/version.inc b/version.inc index 97ba9c359..e71192c92 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-12-07.1239 +2015-12-14.1246 |