Merge branch 'master' into develop

2015-10-14 08:43:14 -05:00
parent b1b33c8527 421c0d0aba
commit 5b08ff0b34
4 changed files with 6 additions and 4 deletions
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -24,7 +24,7 @@ class AuthServiceProvider extends ServiceProvider
     */
    public function boot(GateContract $gate)
    {
-        parent::registerPolicies($gate);
+        $this->registerPolicies($gate);

        //
    }