Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: dc13e00241349436002a0b697e8739eb31fec6bf https://github.com/phpmyadmin/phpmyadmin/commit/dc13e00241349436002a0b697e87... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2019-10-05 (Sat, 10 October 2019) -03:00

Changed paths: M composer.json

Log Message: ----------- Add conflict on pragmarx/google2fa >=6.1

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev (cherry picked from commit dd5d6d834dfae86297315cd07b7e21c972170495) Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev