Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e79574b4613ac20bac7c76126a502e037c16a47a https://github.com/phpmyadmin/phpmyadmin/commit/e79574b4613ac20bac7c76126a50... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M doc/setup.rst Log Message: ----------- Provide more detailed guideline for customizing configuration See https://github.com/phpmyadmin/docker/issues/82 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 9bc325fefbf5fa3d96aa047b0293f29d224f9bb0 https://github.com/phpmyadmin/phpmyadmin/commit/9bc325fefbf5fa3d96aa047b0293... Author: Michal Čihař <michal@cihar.com> Date: 2017-02-07 (Tue, 07 Feb 2017) Changed paths: M doc/setup.rst Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e00b03a24eec...9bc325fefbf5