Merge branch 'develop'

2020-03-02 13:04:27 -03:00
parent 93ca8d2b6f f8b6d6348b
commit d578a34301
2 changed files with 4 additions and 3 deletions
--- a/common/Alias/Model.php
+++ b/common/Alias/Model.php
@ -3,8 +3,9 @@ namespace Incoviba\Common\Alias;

 use Stringy\Stringy;
 use App\Contract\Auth;
+use Aldarien\Common\Alias\Model as BaseModel;

-class Model extends \Model
+class Model extends BaseModel
 {
 	public function getTable()
 	{
--- a/composer.json
+++ b/composer.json
@ -28,11 +28,11 @@
    },
    "repositories": [
      {
-        "type": "vcs",
+        "type": "git",
        "url": "//192.168.1.100/git/models.git"
      },
      {
-        "type": "vcs",
+        "type": "git",
        "url": "//192.168.1.100/git/auth.git"
      }
    ]