robonen be8b5faa32 Merge branch 'task' into journal ...

# Conflicts:
#	app/Http/Controllers/Users/StudentController.php
#	app/Models/SchoolClass.php
#	app/Models/Teacher.php
#	composer.json
#	composer.lock
#	database/migrations/2020_12_03_104028_create_bank_task_files_table.php
#	routes/api.php

2020-12-16 23:08:17 +07:00

..

api.php

Merge branch 'task' into journal

2020-12-16 23:08:17 +07:00

channels.php

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

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

console.php

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

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

web.php

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

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