Merge branch 'dev' into dev
authorWillem Visser <willem@gmail.com>
Wed, 18 Apr 2018 07:10:24 +0000 (09:10 +0200)
committerGitHub <noreply@github.com>
Wed, 18 Apr 2018 07:10:24 +0000 (09:10 +0200)
commit3145abb4aa9973845be7760d6c882bd577fa58e4
tree14e039f079f26516fcd1499e07a7426158657a30
parent2fbe78b2718ba27a126c1eb3b12af1e66c110646
parentab38506931602e4fab913e5b24428246d6e46f70
Merge branch 'dev' into dev
.travis.yml