Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8f640b90302da6f8b5a635d473b4919a42b1e6ec https://github.com/phpmyadmin/phpmyadmin/commit/8f640b90302da6f8b5a635d473b4... Author: Michal Čihař michal@cihar.com Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths: M ChangeLog M prefs_manage.php

Log Message: ----------- Do not point users to setup when it is disabled

Fixes #13084

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 4cdfa9a01462ff2f2073e230c780c2a8b88be1ca https://github.com/phpmyadmin/phpmyadmin/commit/4cdfa9a01462ff2f2073e230c780... Author: Michal Čihař michal@cihar.com Date: 2017-03-15 (Wed, 15 Mar 2017)

Changed paths: M ChangeLog M prefs_manage.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eae5041df22f...4cdfa9a01462