From cce498b530ed272dfdcbfb657168623a4210e774 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 5 Nov 2015 14:11:15 +0100 Subject: [PATCH] Merge branch '1.2.x' # Conflicts: # spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc --- .../src/main/asciidoc/appendix-application-properties.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc index 2bc75548af..74e9732f94 100644 --- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc +++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc @@ -306,6 +306,7 @@ content into your application; rather pick only the properties that you need. spring.mvc.favicon.enabled=true # Enable resolution of favicon.ico. spring.mvc.ignore-default-model-on-redirect=true # If the content of the "default" model should be ignored during redirect scenarios. spring.mvc.locale= # Locale to use. + spring.mvc.media-types.*= # Maps file extensions to media types for content negotiation. spring.mvc.message-codes-resolver-format= # Formatting strategy for message codes. For instance `PREFIX_ERROR_CODE`. spring.mvc.throw-exception-if-no-handler-found=false # If a "NoHandlerFoundException" should be thrown if no Handler was found to process a request. spring.mvc.view.prefix= # Spring MVC view prefix.