Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 826a885a90b2f9628a9c0a1b52f94e2016bbd255 https://github.com/phpmyadmin/phpmyadmin/commit/826a885a90b2f9628a9c0a1b52f9... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)

Changed paths: M libraries/vendor_config.php

Log Message: ----------- Fix comment for sql-parser vendor config

Fixes #12745

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

Commit: a4b6654293162f028fd4ed1bc573f241bdebb119 https://github.com/phpmyadmin/phpmyadmin/commit/a4b6654293162f028fd4ed1bc573... Author: Michal Čihař michal@cihar.com Date: 2016-11-28 (Mon, 28 Nov 2016)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/85f297ea6d4a...a4b665429316