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

4 Commits

Author SHA1 Message Date
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
nikden13
045a767774 auth 2020-12-16 03:13:20 +07:00
ashen-1-dev
dda49ceb17 Модуль Задания 2020-12-10 21:14:51 +07:00
54732a9f6a Регистрация и вход для всех ролей 2020-12-02 23:58:36 +07:00