Chris Walker da3bd1da8b Merge branch 'jetty-9.4.x' into jetty-10.0.x ... # Conflicts: # jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc # jetty-http/src/test/java/org/eclipse/jetty/http/MultiPartFormInputStreamTest.java		2020-03-20 14:30:22 -05:00
..
src	Merge branch 'jetty-9.4.x' into jetty-10.0.x	2020-03-20 14:30:22 -05:00
pom.xml	Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere	2020-03-20 11:12:08 -05:00