Merge branch 'master' of https://github.com/smart-coding/springboot-web.git

smart-coding · smart-coding · commit 9c01cfd96ef4 · 2016-09-11T11:12:38.000+08:00
diff --git a/springboot-web/pom.xml b/springboot-web/pom.xml
@@ -13,7 +13,7 @@
 	 <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.3.6.RELEASE</version>
+        <version>1.4.0.RELEASE</version>
     </parent>
     
     <properties>
