robonen 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

..

AppServiceProvider.php

общий код

2020-12-03 23:33:04 +07:00

AuthServiceProvider.php

Merge branch 'journal' into timetable

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

BroadcastServiceProvider.php

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

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

EventServiceProvider.php

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

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

RouteServiceProvider.php

Merge branch 'news' into journal

2020-12-16 22:47:08 +07:00