Learn more about cloning repositories
You have read-only access
Merge branch 'lighthouse-1782-patch' into 1.3.x Conflicts: framework/src/play/db/jpa/JPAPlugin.java