]> git.mxchange.org Git - jshop-core.git/commitdiff
Merge branch 'rewrites/jpa' of e:/Java Project/jshop-core
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:51:14 +0000 (08:51 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:51:14 +0000 (08:51 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/jcore.jar


Trivial merge