eugenp 6c6cc61caf Merge branch 'master' of https://github.com/eugenp/tutorials ... Conflicts: spring-rest/pom.xml spring-rest/src/main/webapp/WEB-INF/web.xml		2015-07-23 16:56:24 +03:00
..
java/org/baeldung	Fix formatting files	2015-07-22 22:22:39 +02:00
resources	project restructure for cleanup purposes	2013-07-26 12:08:21 +03:00
webapp/WEB-INF	Merge branch 'master' of https://github.com/eugenp/tutorials	2015-07-23 16:56:24 +03:00