Merge branch 'master' into code-format-black
commit7f443ac8ed25c1723c8b5dfb5dcfb805dc4687d1
authorStefan Kögl <stefan@skoegl.net>
Sat, 20 Oct 2018 15:02:03 +0000 (20 17:02 +0200)
committerStefan Kögl <stefan@skoegl.net>
Sat, 20 Oct 2018 15:02:03 +0000 (20 17:02 +0200)
tree6e323f2946c91b0010ddf5b0db268927b47c9f79
parent7025c116795c9fbc799369089749999b13b43a4e
parentb34ab197c74d1efa3a47a49446e607bb0589438a
Merge branch 'master' into code-format-black
.travis.yml
requirements-dev.txt
requirements-test.txt