Merge branch 'displayParam' of github.com:mkurz/play-authenticate · joscha/play-authenticate@fff5278 · GitHub

This repository has been archived by the owner on Feb 10, 2021. It is now read-only.

Commit

Merge branch 'displayParam' of github.com:mkurz/play-authenticate

Browse files

Conflicts:
	samples/java/play-authenticate-usage/test/FacebookOAuth2PopupTest.java
	samples/java/play-authenticate-usage/test/FacebookOAuth2Test.java

Loading branch information

joscha committed Oct 29, 2014

2 parents 2851798 + c2d79ff commit fff5278