Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 97ab2953a942e30aba3893f81aee9a13a0b9e0fa https://github.com/phpmyadmin/phpmyadmin/commit/97ab2953a942e30aba3893f81aee... Author: William Desportes williamdes@wdes.fr Date: 2019-05-04 (Sat, 05 May 2019) +02:00

Changed paths: M libraries/classes/Menu.php

Log Message: ----------- Fixes #15157 - 'Settings' not marked as active when browsing 2FA settings

Fixes: #15157 [ci skip] Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 20227b058dcbcdc89d0f1933ecdc25c65fa73df3 https://github.com/phpmyadmin/phpmyadmin/commit/20227b058dcbcdc89d0f1933ecdc... Author: William Desportes williamdes@wdes.fr Date: 2019-05-04 (Sat, 05 May 2019) +02:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for #15157

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

Commit: 175133d47b24662a9851a64ebcd39be520602db1 https://github.com/phpmyadmin/phpmyadmin/commit/175133d47b24662a9851a64ebcd3... Author: William Desportes williamdes@wdes.fr Date: 2019-05-04 (Sat, 05 May 2019) +02:00

Changed paths: M ChangeLog M libraries/classes/Menu.php

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

Closes: #15158 Signed-off-by: Agha Saad Fraz agha.saad04@gmail.com Signed-off-by: William Desportes williamdes@wdes.fr