From: Gustavo Martin Morcuende Date: Sun, 3 Jan 2016 00:14:42 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/gumartinm/JavaForFun X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=3772a17dcc18236fc38d0ae8a12673aad263e620;p=JavaForFun Merge branch 'master' of https://github.com/gumartinm/JavaForFun Conflicts: SpringJava/REST/src/main/java/de/spring/webservices/rest/CarController.java --- 3772a17dcc18236fc38d0ae8a12673aad263e620