Merge branch 'master' into javawebsocket-jsr

2013-06-05 17:16:02 -07:00 · 2013-06-05 17:16:02 -07:00 · 12d414c9fc
parent ffceb642c5 822b639829
commit 12d414c9fc
1 changed files with 0 additions and 8 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +0,0 @@
 branches:
  only:
    - /^release-.*$/
 language: java
 script: mvn install
 jdk:
  - openjdk7
  - oraclejdk7