Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson
2014-09-23 09:42:29 +01:00

View File

@@ -124,7 +124,7 @@ public class WebMvcAutoConfiguration {
return new HiddenHttpMethodFilter();
}
// Defined as a nested config to ensure WebMvcConfigurerAdapter it not read when not
// Defined as a nested config to ensure WebMvcConfigurerAdapter is not read when not
// on the classpath
@Configuration
@EnableWebMvc