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

This commit is contained in:
Hillel Coren 2016-07-20 11:02:56 +03:00
commit baaa25127c

View File

@ -13,6 +13,10 @@
} }
], ],
"require": { "require": {
"php": ">=5.5.9",
"ext-mcrypt": "*",
"ext-gmp": "*",
"ext-gd": "*",
"turbo124/laravel-push-notification": "dev-laravel5", "turbo124/laravel-push-notification": "dev-laravel5",
"omnipay/mollie": "dev-master#22956c1a62a9662afa5f5d119723b413770ac525", "omnipay/mollie": "dev-master#22956c1a62a9662afa5f5d119723b413770ac525",
"omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248", "omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248",