Merge branch 'master' into dev

2017-07-04 00:14:55 +02:00 · 2017-07-04 00:14:55 +02:00 · a401eaac11
parent 39bbeafe6b 3ad1e54f51
commit a401eaac11
1 changed files with 1 additions and 0 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,3 +1,4 @@
 language: java
 jdk:
  - oraclejdk8