Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a7950faf52d73b0553fef1246f64294433e66e61 https://github.com/phpmyadmin/phpmyadmin/commit/a7950faf52d73b0553fef1246f64... Author: Michal Čihař michal@cihar.com Date: 2017-02-14 (Tue, 14 Feb 2017)

Changed paths: M composer.json

Log Message: ----------- Make tcpdf really optional in composer.json

- remove it from require - add it to require-dev as testsuite does not work without it - add conflict to avoid installing old version

Fixes #12975

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