Merge remote-tracking branch 'upstream/master'

2019-01-29 21:23:16 -02:00
parent 43d429e415 ef7bcbe669
commit 65a5783d01
86 changed files with 1548 additions and 293 deletions
@@ -717,7 +717,6 @@
                <module>spring-rest-simple</module>
                <module>spring-resttemplate</module>
                <module>spring-roo</module>
-                
                <module>spring-security-acl</module>
                <module>spring-security-angular/server</module>
                <module>spring-security-cache-control</module>