Merge branch 'master' into master

This commit is contained in:
Jens Hausdorf 2017-11-08 17:56:27 +01:00 committed by GitHub
commit d7a3cb72b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,6 +5,7 @@ dist: trusty
branches:
only:
- master
- v1.x
cache:
directories: