Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d7e7a0653502515968cab43877a3c4fdbc127819 https://github.com/phpmyadmin/phpmyadmin/commit/d7e7a0653502515968cab43877a3... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)

Changed paths: M composer.json

Log Message: ----------- Add pcre to deps

Issue #12785

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

Commit: 65b59fd7e3d8c81ec79b8425898b6fc387ce4375 https://github.com/phpmyadmin/phpmyadmin/commit/65b59fd7e3d8c81ec79b8425898b... Author: Michal Čihař michal@cihar.com Date: 2016-12-07 (Wed, 07 Dec 2016)

Changed paths: M composer.json

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/28f4ebcc0e07...65b59fd7e3d8