Conflicts: app/Http/Controllers/AccountController.php app/Http/routes.php app/Models/User.php resources/lang/en/texts.php |
||
|---|---|---|
| .. | ||
| assets/less | ||
| lang | ||
| views | ||
Conflicts: app/Http/Controllers/AccountController.php app/Http/routes.php app/Models/User.php resources/lang/en/texts.php |
||
|---|---|---|
| .. | ||
| assets/less | ||
| lang | ||
| views | ||