Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

2016-11-04 18:23:31 +05:30
parent e4b9755294
commit 775e0561d8
2541 changed files with 59048 additions and 90348 deletions
--- a/config/app.php
+++ b/config/app.php
@@ -245,7 +245,7 @@ return [
        'JWTAuth'     => 'Tymon\JWTAuth\Facades\JWTAuth',
        'JWTFactory'  => 'Tymon\JWTAuth\Facades\JWTFactory',
        'Breadcrumbs' => 'DaveJamesMiller\Breadcrumbs\Facade',
-        'GeoIP'       => 'Torann\GeoIP\GeoIPFacade',
+        'GeoIP'       => \Torann\GeoIP\Facades\GeoIP::class,
        'Image'       => Intervention\Image\Facades\Image::class,
        'FCM'         => LaravelFCM\Facades\FCM::class,
        'FCMGroup'    => LaravelFCM\Facades\FCMGroup::class,