19 Apr
2016
19 Apr
'16
4:39 p.m.
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a0154623b5f2c49dd79d300eb4954a0c179fe7e3 https://github.com/phpmyadmin/phpmyadmin/commit/a0154623b5f2c49dd79d300eb495... Author: Michal Čihař michal@cihar.com Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths: M composer.json
Log Message: ----------- Fix wrong merge in composer.json
Signed-off-by: Michal Čihař michal@cihar.com