diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
commit | 628e565a6c5ee52341ba6de0b5ecf6495cbb78f8 (patch) | |
tree | 737c1027334a211b62b4a278f87be80bb7e17a4c /version.inc | |
parent | a721f39945bf3213c4305a389946c464b831a5f9 (diff) | |
parent | 84bf7058119bb2ed48358678be9c212a66c8cb83 (diff) | |
download | volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.gz volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.bz2 volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.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 e71192c92..ae4a0dd7c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-12-14.1246 +2015-12-17.1249 |