Quantcast

Merge remote-tracking branch 'master/dev' into dev

Author Merathilis <neo0608@gmail.com>
Author date 2017-09-16 23:02:35
Author local date 2017-09-17 01:02:35 +0200
Committer Merathilis <neo0608@gmail.com>
Committer date 2017-09-16 23:02:35
Committer local date 2017-09-17 01:02:35 +0200
Commit 49a2eec56bc1b420e9b74052af2be4b38e7b87a0
Tree 13e5b3c0b98c748429664042137bac1f02e19de3
Parent ba6283613274526ba2cae6c54473833b51808d26
Parent ddd6f999e0b4d12aad1a0b6189d84a786f5094b8
Merge remote-tracking branch 'master/dev' into dev