Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0971a91698a6ae2e5dd70447bd76f59964162669 https://github.com/phpmyadmin/phpmyadmin/commit/0971a91698a6ae2e5dd70447bd76... Author: Michal Čihař michal@cihar.com Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths: M js/codemirror/addon/lint/lint.js M js/codemirror/addon/lint/sql-lint.js

Log Message: ----------- Change variable name to match upstream

See https://github.com/codemirror/CodeMirror/pull/4861

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

Commit: 0cd143f274e2d1d43a95e6db1dd7b00f96079163 https://github.com/phpmyadmin/phpmyadmin/commit/0cd143f274e2d1d43a95e6db1dd7... Author: Michal Čihař michal@cihar.com Date: 2017-07-18 (Tue, 18 Jul 2017)

Changed paths: M js/codemirror/addon/lint/sql-lint.js M js/vendor/codemirror/addon/lint/lint.js

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cc954750bbb3...0cd143f274e2