Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9ba7d44c1899b57a6ffbb5bc20979d90a023d18d https://github.com/phpmyadmin/phpmyadmin/commit/9ba7d44c1899b57a6ffbb5bc2097... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-21 (Thu, 21 Apr 2016) Changed paths: M ChangeLog M setup/config.php Log Message: ----------- Fixed loading of configuration file If the loaded configuration is same as the one used, include_once will not load it. Fixes #12206 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: d238f2a70150230263667b21554083dc0cc76066 https://github.com/phpmyadmin/phpmyadmin/commit/d238f2a70150230263667b215540... Author: Michal Čihař <michal@cihar.com> Date: 2016-04-21 (Thu, 21 Apr 2016) Changed paths: M ChangeLog M setup/config.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fa68cb5fe24d...d238f2a70150