Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5b928b91381f5c14c5aced29f786b3e5b3c3f821 https://github.com/phpmyadmin/phpmyadmin/commit/5b928b91381f5c14c5aced29f786... Author: Michal Čihař michal@cihar.com Date: 2016-02-08 (Mon, 08 Feb 2016)

Changed paths: M doc/setup.rst

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

The port has been changed from 8080 to 80 in https://github.com/phpmyadmin/docker/pull/19

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

Commit: 19395d89f15026abd3e8479ee5cf8290d70ca7ee https://github.com/phpmyadmin/phpmyadmin/commit/19395d89f15026abd3e8479ee5cf... Author: Michal Čihař michal@cihar.com Date: 2016-02-08 (Mon, 08 Feb 2016)

Changed paths: M doc/setup.rst

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2a01a5520d25...19395d89f150