Merge branch '2.6.x' into 2.7.x

Closes gh-31188
4 years ago · d2397bd34e
1 changed files with 1 additions and 0 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/MimeMappings.java
@ -203,6 +203,7 @@ public final class MimeMappings implements Iterable<MimeMappings.Mapping> {
				@@ -203,6 +203,7 @@ public final class MimeMappings implements Iterable<MimeMappings.Mapping> {
 		mappings.add("xul", "application/vnd.mozilla.xul+xml");
 		mappings.add("xwd", "image/x-xwindowdump");
 		mappings.add("vsd", "application/vnd.visio");
+		mappings.add("wasm", "application/wasm");
 		mappings.add("wav", "audio/x-wav");
 		mappings.add("wbmp", "image/vnd.wap.wbmp");
 		mappings.add("wml", "text/vnd.wap.wml");