Merge branch 'master' into marin-t/fix
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 12 Aug 2019 10:21:46 +0000 (12:21 +0200)
commit8f381c9ba44ba9902f385949f99b4a106cb512c8
treeebd276ee20d840cc9170ac1dee1bc61899cdb3b7
parenta19691c00ed5c5fedb760bf023945ef041f6f509
parentdf33af4f3b2347ecf28f744da7a2814c004b57cb
Merge branch 'master' into marin-t/fix