Merge branch 'master' into martin-t/globals
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 10:00:17 +0000 (11:00 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 16 Nov 2018 10:00:17 +0000 (11:00 +0100)
commit8d6f21900d200a9f7941803cb308f483e818dda4
tree462d393a4ef19099fa62b378bc97d7c83e57b74b
parent5f3fd912090c6369e5be3451f24fbef724264e06
parent314e90960336ef340dc7eb34ae375a091ac60645
Merge branch 'master' into martin-t/globals