Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5273729cf50ec39af39e855a90289cb70887ac4e https://github.com/phpmyadmin/phpmyadmin/commit/5273729cf50ec39af39e855a9028... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M doc/setup.rst Log Message: ----------- Fix path to example configuration Fixes #12787 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a221ae90c37be93674101d12fde24617c9862cfe https://github.com/phpmyadmin/phpmyadmin/commit/a221ae90c37be93674101d12fde2... Author: Michal Čihař <michal@cihar.com> Date: 2016-12-06 (Tue, 06 Dec 2016) Changed paths: M doc/setup.rst Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/00dd06c0e156...a221ae90c37b