Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 05a258778f5ecbdb123581d316e965eb51e17740 https://github.com/phpmyadmin/phpmyadmin/commit/05a258778f5ecbdb123581d316e9... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php

Log Message: ----------- ReCaptcha now works without allow_url_fopen

Fixes #12588

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 3bd6d4c6451388c846c7cfa122416158ed54a1c0 https://github.com/phpmyadmin/phpmyadmin/commit/3bd6d4c6451388c846c7cfa12241... Author: Michal Čihař michal@cihar.com Date: 2016-11-30 (Wed, 30 Nov 2016)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e3a3f35db3ec...3bd6d4c64513