Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 191bbd9575603405d05277c1928fe6a6e9a7a3ad https://github.com/phpmyadmin/phpmyadmin/commit/191bbd9575603405d05277c1928f... Author: Michal Čihař michal@cihar.com Date: 2016-10-18 (Tue, 18 Oct 2016)

Changed paths: M doc/setup.rst

Log Message: ----------- Adjust documentation to match current Docker container

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

Commit: 7e2a2b457ae98a6a85a343f30d8445b2b9351332 https://github.com/phpmyadmin/phpmyadmin/commit/7e2a2b457ae98a6a85a343f30d84... Author: Michal Čihař michal@cihar.com Date: 2016-10-18 (Tue, 18 Oct 2016)

Changed paths: M doc/setup.rst

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c7bc718511b6...7e2a2b457ae9