diff options
| author | Joakim Erdfelt | 2015-12-02 18:39:52 +0000 |
|---|---|---|
| committer | Joakim Erdfelt | 2015-12-02 18:39:52 +0000 |
| commit | 1e6b94094235aa9a7af543959c3488ea0bbd60d0 (patch) | |
| tree | a42cd63b8fd1aaf70a701376e1c7e995bd5936c0 /jetty-websocket/javax-websocket-server-impl/src/main/resources/META-INF | |
| parent | ddba6c20cd78a562abc0766a2e82de16034793ed (diff) | |
| parent | c83bf80702734b2f4a4450cad1adbeb24642945b (diff) | |
| download | org.eclipse.jetty.project-1e6b94094235aa9a7af543959c3488ea0bbd60d0.tar.gz org.eclipse.jetty.project-1e6b94094235aa9a7af543959c3488ea0bbd60d0.tar.xz org.eclipse.jetty.project-1e6b94094235aa9a7af543959c3488ea0bbd60d0.zip | |
Merge branch 'jetty-9.3.x'
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
Diffstat (limited to 'jetty-websocket/javax-websocket-server-impl/src/main/resources/META-INF')
0 files changed, 0 insertions, 0 deletions