Commits
Peter Hilton authored a23bc7783c2M
Merge branch 'lighthouse-554-patch' of https://github.com/nicmarti/play into nicmarti-lighthouse-554-patch Conflicts: .gitignore documentation/commands/cmd-check.txt documentation/commands/cmd-list-modules.txt documentation/commands/cmd-new-module.txt documentation/manual/test.textile framework/pym/play/commands/check.py framework/pym/play/utils.py framework/src/play.plugins framework/src/play/Play.java framework/src/play/db/jpa/JPAPlugin.java framework/src/play/mvc/Router.java framework/src/play/mvc/results/Error.java framework/src/play/server/PlayHandler.java framework/src/play/server/ssl/SslHttpServerContextFactory.java framework/src/play/server/ssl/SslPlayHandler.java modules/docviewer/app/views/PlayDocumentation/page.html modules/docviewer/public/playmanual/manual.css nbproject/project.xml samples-and-tests/just-test-cases/test/binding.test.html Merged just JPA documentation change
Showing diff toedce54f94dc