Merge remote-tracking branch 'upstream/master' into dev
authorVincent Torri <vincent.torri@gmail.com>
Sun, 2 Dec 2018 17:46:14 +0000 (18:46 +0100)
committerVincent Torri <vincent.torri@gmail.com>
Sun, 2 Dec 2018 17:46:14 +0000 (18:46 +0100)
commit65ff6f80739c4fcf3c38702f8fd1b96047695c38
treefab76777577135b43b6340ca8d20a4a17e03a519
parentbd2b259760f08f606363732a1c21d7b9331e909e
parent01d2a721d393646384291af2f6f2f940493cd78f
Merge remote-tracking branch 'upstream/master' into dev