[phpMyAdmin Git] [phpmyadmin/phpmyadmin] cc6d1b: #16407 - Bump pragmarx/google2fa conflict to >8.0

[William Desportes]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: cc6d1beb026aed6fe2be71b07af7df88769a2509
https://github.com/phpmyadmin/phpmyadmin/commit/cc6d1beb026aed6fe2be71b07af7df88769a2509
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-11-13 (Fri, 11 November 2020) +01:00

Changed paths: 
M composer.json

Log Message:
-----------
#16407 - Bump pragmarx/google2fa conflict to >8.0

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: bb3082b0f5165ef45d693f497c6c0104d21c9ee5
https://github.com/phpmyadmin/phpmyadmin/commit/bb3082b0f5165ef45d693f497c6c0104d21c9ee5
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-11-13 (Fri, 11 November 2020) +01:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add a ChangeLog entry for #16407

Signed-off-by: William Desportes <williamdes at wdes.fr>