Guillermo Lopez d25a282447 Merge branch 'master' into BAEL-2804
Conflicts:
	persistence-modules/java-jpa-2/README.md
	persistence-modules/java-jpa-2/pom.xml
	persistence-modules/java-jpa/pom.xml
	persistence-modules/pom.xml
2019-08-07 22:21:33 -03:00
..
2019-08-07 22:21:33 -03:00
2019-08-07 22:21:33 -03:00
2019-08-07 22:21:33 -03:00

Relevant Articles

<<<<<<< HEAD

refs/heads/master