Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6deff4131c07be220bdee59af392d80c5b996743 https://github.com/phpmyadmin/phpmyadmin/commit/6deff4131c07be220bdee59af392... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-08 (Mon, 08 Aug 2016) Changed paths: M doc/setup.rst Log Message: ----------- Document docker configuration customization See https://github.com/phpmyadmin/docker/pull/42 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 12a66952a9498fc5eca58115d9adfe85c44e01c2 https://github.com/phpmyadmin/phpmyadmin/commit/12a66952a9498fc5eca58115d9ad... Author: Michal Čihař <michal@cihar.com> Date: 2016-08-08 (Mon, 08 Aug 2016) Changed paths: M doc/setup.rst Log Message: ----------- Use long key IDs or fingerprints to point to keys This is safer than short IDs, where colliscion could exist. Fixes #12448 Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cb4a8eef4fac...12a66952a949