spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Phillip Webb
2015-09-08 14:37:16 -07:00
parent 026c3019df e04fb15574
commit 0335053139
94 changed files with 446 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class SampleAtmosphereApplication {
@Override
public void onStartup(ServletContext servletContext) throws ServletException {
onStartup(Collections.<Class<?>> emptySet(), servletContext);
onStartup(Collections.<Class<?>>emptySet(), servletContext);
}
}