Merge branch 'master' of https://github.com/Maiklins/tutorials into JAVA-3528-move-spring-mvc-velocity-module

Conflicts: spring-web-modules/pom.xml
2020-12-30 12:41:29 +01:00
parent 6a0313b4db 918057ed1b
commit c2a10624ec
17 changed files with 19 additions and 4 deletions
@@ -21,6 +21,7 @@
        <module>spring-mvc-crash</module>
        <module>spring-mvc-forms-jsp</module>
        <module>spring-mvc-velocity</module>
+        <module>spring-mvc-webflow</module>
        <module>spring-rest-angular</module>
        <module>spring-rest-http</module>
        <module>spring-resttemplate-2</module>