Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 16567c6b2b0efeb8f0f2853464244462987a907f https://github.com/phpmyadmin/phpmyadmin/commit/16567c6b2b0efeb8f0f285346424... Author: Michal Čihař michal@cihar.com Date: 2017-03-01 (Wed, 01 Mar 2017)

Changed paths: M test/ci-lint

Log Message: ----------- Do not rely on xargs

It does not work as expected on OSX.

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

Commit: f2eac37c1e52ce72725b8294572a5eaf94a5a4c6 https://github.com/phpmyadmin/phpmyadmin/commit/f2eac37c1e52ce72725b8294572a... Author: Michal Čihař michal@cihar.com Date: 2017-03-01 (Wed, 01 Mar 2017)

Changed paths: M test/ci-lint

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d3fe2991d068...f2eac37c1e52