Robonen Andrew b9326ad722 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

2020-12-16 23:14:06 +07:00

..

Console

Регистрация и вход для всех ролей

2020-12-02 23:58:36 +07:00

Exceptions

auth

2020-12-16 03:13:20 +07:00

Filters

Модуль журнала

2020-12-16 05:22:28 +07:00

Http

Merge branch 'journal' into timetable

2020-12-16 23:14:06 +07:00

Models

Merge branch 'journal' into timetable

2020-12-16 23:14:06 +07:00

Providers

Merge branch 'journal' into timetable

2020-12-16 23:14:06 +07:00