Branch: refs/heads/master 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> Commit: 4bb1a2d80e117c0a06ea9fe806601ccbe10d9c64 https://github.com/phpmyadmin/phpmyadmin/commit/4bb1a2d80e117c0a06ea9fe80660... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2019-10-05 (Sat, 10 October 2019) -03:00 Changed paths: M test/classes/Controllers/Server/Status/AdvisorControllerTest.php Log Message: ----------- Fix missing version key on AdvisorControllerTest Related to 88821f8248b4544fe51c426cea0cecd1aaaa1af2 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Commit: 441a33d1fcfe305d8e70fd9c8ae1d946704370b3 https://github.com/phpmyadmin/phpmyadmin/commit/441a33d1fcfe305d8e70fd9c8ae1... Author: Maurício Meneghini Fauth <mauricio@fauth.dev> Date: 2019-10-05 (Sat, 10 October 2019) -03:00 Changed paths: M test/classes/Controllers/Server/Status/AdvisorControllerTest.php Log Message: ----------- Merge branch 'QA_5_0'