Marc Delisle 8e666ec1b5 Fix merge conflicts ... Signed-off-by: Marc Delisle <marc@infomarc.info>		2015-10-24 16:35:58 -04:00
..
recaptcha	Fix #11389 ReCaptcha produce deprecated messages under PHP 7	2015-08-12 09:49:22 +05:30
swekey	Set namespace on Advisor, Config, Console and Util classes.	2015-09-01 21:22:52 +02:00
AuthenticationConfig.php	Make PHPCS happy.	2015-10-07 21:51:21 +02:00
AuthenticationCookie.php	Fix merge conflicts	2015-10-24 16:35:58 -04:00
AuthenticationHttp.php	Make PHPCS happy.	2015-10-07 22:49:49 +02:00
AuthenticationSignon.php	Fix calls.	2015-09-05 22:58:47 +02:00