gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2016-04-19 16:26:04 +02:00
commit ce745efb3d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -26,6 +26,7 @@
}
},
"require": {
<<<<<<< HEAD
"php": ">=5.5.0",
"ext-mbstring": "*",
"ext-xml": "*",
@ -47,8 +48,8 @@
"phpunit/phpunit": "~4.1",
"codacy/coverage": "dev-master",
"phpunit/phpunit-selenium": "~1.2",
"phpmyadmin/coding-standard": ">=0.1.0",
"squizlabs/php_codesniffer": "2.*"
"squizlabs/php_codesniffer": "2.*",
"phpmyadmin/coding-standard": ">=0.1.0"
},
"repositories": [
{