[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 71ae2b: Fix for #14171 - 2FA QR PHPGD

[Maurício Meneghini Fauth]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 71ae2b2e6895141c4f0102bf137dba18210ebfb8
      https://github.com/phpmyadmin/phpmyadmin/commit/71ae2b2e6895141c4f0102bf137dba18210ebfb8
  Author: William Desportes <williamdes at wdes.fr>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M ChangeLog
    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 at wdes.fr>
(cherry picked from commit 49fae815051005779fb283fa404f9153d2c29b1f)
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>


  Commit: da21c50f87aa67001e1e26d5de461a954e3529b9
      https://github.com/phpmyadmin/phpmyadmin/commit/da21c50f87aa67001e1e26d5de461a954e3529b9
  Author: Maurício Meneghini Fauth <mauriciofauth at gmail.com>
  Date:   2018-07-04 (Wed, 04 Jul 2018)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_8'

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth at gmail.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5f5515c1dd99...da21c50f87aa
      **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.