Merge branch 'master' into simonduq-patch-1

This commit is contained in:
Simon Duquennoy 2017-11-17 14:58:33 +01:00 committed by GitHub
commit 0bbd934cf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
language: java language: java
jdk: jdk:
- oraclejdk7 - oraclejdk8
- openjdk7 - openjdk8