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

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

Log Message: ----------- Update to current lint plugin

Our patch has been integrated.

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

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

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0cd143f274e2...9eb7287b72ec