Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000 (15:02 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 28 Nov 2018 14:02:09 +0000 (15:02 +0100)
commit95cf7d7374c5544e7d172e51e08fc3e97be0444a
tree061017d84b5ab8e7ab8de3168340700a8ff78992
parent8d6f21900d200a9f7941803cb308f483e818dda4
parentb86c4e4f6e636f8b69467a43a8d4f50368601406
Merge branch 'master' into martin-t/globals