Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 31ba6ddd14328ad7c71bcbee70681a006931b4d4 https://github.com/phpmyadmin/phpmyadmin/commit/31ba6ddd14328ad7c71bcbee7068... Author: Marc Delisle marc@infomarc.info Date: 2017-04-03 (Mon, 03 Apr 2017)

Changed paths: M doc/setup.rst

Log Message: ----------- English improvements and typo fixes

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 691349f1ab31a96fd8dc6de32b115f2f4fbc784e https://github.com/phpmyadmin/phpmyadmin/commit/691349f1ab31a96fd8dc6de32b11... Author: Michal Čihař michal@cihar.com Date: 2017-04-03 (Mon, 03 Apr 2017)

Changed paths: M doc/setup.rst

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/827c71f86ac3...691349f1ab31