Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Nov 2018 14:35:41 +0000 (15:35 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 10 Nov 2018 14:35:41 +0000 (15:35 +0100)
commitd219ac051d67eae4559bbc7f0902fe2e0ea539ae
tree4912240f222b6f392ce37d042cc7b3dca80f532a
parentc21b45f4213817b09099f99cc70e4f8d87f1713c
parent499fb232cdc9ccd215d3d6c5892ff8be57cd829a
Merge branch 'master' into martin-t/globals