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

Merge branch 'journal' into timetable

# 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:
2020-12-16 23:14:06 +07:00
49 changed files with 2078 additions and 330 deletions

View File

@@ -32,4 +32,8 @@ class SchoolClass extends Model
}
public function tasks() {
return $this->hasMany(Task::class, 'class_id');
}
}