Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-servlet/src
History
Joakim Erdfelt 3861e9f9ca Merge branch 'jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 		2019-09-13 10:02:05 -05:00
..
main Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-13 10:02:05 -05:00
test Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-13 10:02:05 -05:00