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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-11-16 11:28:12 +01:00
commit a38a8b9243
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -53,7 +53,7 @@
"psr/container": "^1.0",
"twig/twig": "^1.32",
"twig/extensions": "~1.4.1",
"symfony/expression-language": "^3.2",
"symfony/expression-language": "^3.2 || ^2.8",
"symfony/polyfill-mbstring": "^1.3"
},
"conflict": {