Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 22:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2018-03-19 09:28:43 +02:00
commit 3e7f3d772f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -59,7 +59,7 @@
"roave/security-advisories": "dev-master", "roave/security-advisories": "dev-master",
"simshaun/recurr": "dev-master", "simshaun/recurr": "dev-master",
"symfony/css-selector": "~3.1", "symfony/css-selector": "~3.1",
"turbo124/laravel-push-notification": "2.*", "davibennun/laravel-push-notification": "dev-laravel5",
"webpatser/laravel-countries": "dev-master#75992ad", "webpatser/laravel-countries": "dev-master#75992ad",
"websight/l5-google-cloud-storage": "dev-master", "websight/l5-google-cloud-storage": "dev-master",
"wepay/php-sdk": "^0.2", "wepay/php-sdk": "^0.2",

2
config/push-notification.php
View File

@ -17,7 +17,7 @@ return [
'ninjaAndroid' => [ 'ninjaAndroid' => [
'environment' =>'production', 'environment' =>'production',
'apiKey' =>env('FCM_API_TOKEN'), 'apiKey' =>env('FCM_API_TOKEN'),
'service' =>'fcm' 'service' =>'gcm'
] ]
]; ];