Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

This commit is contained in:
Hillel Coren 2016-07-02 22:35:17 +03:00
commit 81f7d93fbf

View File

@ -73,7 +73,6 @@
"omnipay/braintree": "~2.0@dev", "omnipay/braintree": "~2.0@dev",
"gatepay/FedACHdir": "dev-master@dev", "gatepay/FedACHdir": "dev-master@dev",
"websight/l5-google-cloud-storage": "^1.0", "websight/l5-google-cloud-storage": "^1.0",
"fzaninotto/faker": "^1.5",
"wepay/php-sdk": "^0.2", "wepay/php-sdk": "^0.2",
"collizo4sky/omnipay-wepay": "dev-additional-calls" "collizo4sky/omnipay-wepay": "dev-additional-calls"
}, },
@ -84,7 +83,8 @@
"codeception/c3": "~2.0", "codeception/c3": "~2.0",
"symfony/dom-crawler": "~3.0", "symfony/dom-crawler": "~3.0",
"barryvdh/laravel-ide-helper": "~2.2", "barryvdh/laravel-ide-helper": "~2.2",
"barryvdh/laravel-debugbar": "~2.2" "barryvdh/laravel-debugbar": "~2.2",
"fzaninotto/faker": "^1.5"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [