Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49fae815051005779fb283fa404f9153d2c29b1f https://github.com/phpmyadmin/phpmyadmin/commit/49fae815051005779fb283fa404f... Author: William Desportes williamdes@wdes.fr Date: 2018-06-29 (Fri, 29 Jun 2018)

Changed paths: M libraries/classes/Plugins/TwoFactor/Application.php M templates/login/twofactor/application_configure.twig

Log Message: ----------- Fix for #14171 - 2FA QR PHPGD

Closes: #14171 Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 5f5515c1dd9915b39c693001ff7e76a3825dc914 https://github.com/phpmyadmin/phpmyadmin/commit/5f5515c1dd9915b39c693001ff7e... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-07-04 (Wed, 04 Jul 2018)

Changed paths: M libraries/classes/Plugins/TwoFactor/Application.php M templates/login/twofactor/application_configure.twig

Log Message: ----------- Merge pull request #14356 from williamdes/issue-14171-phpgd

Fix for #14171 - 2FA+QR+PHPGD

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b44e1c4fc6fa...5f5515c1dd99 **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

Functionality will be removed from GitHub.com on January 31st, 2019.