Merge branches 'PAN-16' and 'master' of https://github.com/atusa17/ptp into PAN-16

# Conflicts: # services/build.gradle
2019-03-20 22:00:11 -06:00
parent 5479130178 b15ef858b0
commit 749a20c0fd
48 changed files with 1323 additions and 586 deletions
@@ -1,2 +1,3 @@
 spring.mvc.view.prefix:/WEB-INF/jsp/
-spring.mvc.view.suffix:.jsp
+spring.mvc.view.suffix:.jsp
+server.port=8090