Merge branch 'thetradedesk-master'
commitb51c58d3e095fcb8cea31acfffeebc9ffd705f05
authorFrej Drejhammar <frej.drejhammar@gmail.com>
Thu, 6 Dec 2018 19:01:41 +0000 (6 20:01 +0100)
committerFrej Drejhammar <frej.drejhammar@gmail.com>
Thu, 6 Dec 2018 20:51:32 +0000 (6 21:51 +0100)
tree097346033d0e994c211d271829d6dfb068733751
parent2bb173ef68ab8de11b7d161eced3575f776c322b
parentcadcfcbe9020ddfb0a97b53fc0df323f1259cb56
Merge branch 'thetradedesk-master'

Closes #144