Quantcast

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

Author Merathilis <neo0608@gmail.com>
Author date 2017-09-16 19:28:01
Author local date 2017-09-16 21:28:01 +0200
Committer Merathilis <neo0608@gmail.com>
Committer date 2017-09-16 19:28:01
Committer local date 2017-09-16 21:28:01 +0200
Commit a8651db7d12e09b151c51714488a94d19916789d
Tree 1ac01a453ab0dc81f21e95be43e9521923915f9a
Parent 9e7665676f1ac3a0ebdc9a9c50685a814ddaa33b
Parent b077275b7263d54b1db20e6b25094141dc4da095
Merge remote-tracking branch 'master/dev' into dev