Merge branch 'master' into dev
This commit is contained in:
commit
1e484541a4
|
|
@ -22,7 +22,7 @@
|
||||||
"require": {
|
"require": {
|
||||||
"php" : ">=5.3.0",
|
"php" : ">=5.3.0",
|
||||||
"illuminate/support": "~5.3",
|
"illuminate/support": "~5.3",
|
||||||
"bjeavons/zxcvbn-php": "^0.2"
|
"bjeavons/zxcvbn-php": "^0.3"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit" : "4.*",
|
"phpunit/phpunit" : "4.*",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue