robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Code Activity

Merge branch 'journal' into timetable

Browse Source 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/RegisterController.php
#	app/Http/Controllers/TimetableController.php
#	app/Models/SchoolClass.php
#	app/Models/User.php
#	composer.lock
This commit is contained in:
Andrew Robonen
2020-12-16 23:14:06 +07:00
parent 1726a499d1 be8b5faa32
commit b9326ad722
49 changed files with 2078 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/User.php
View File

@@ -5,7 +5,6 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Carbon\Carbon;
use Laravel\Passport\HasApiTokens;
class User extends Authenticatable