Merge branch 'news' into journal

Browse Source

# Conflicts:
#	app/Http/Controllers/Users/TeacherController.php

...

This commit is contained in:

Andrew Robonen

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

parent 622170c647 37bc147ba4

commit 509562a76c

21 changed files with 654 additions and 271 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

577

composer.lock generated

File diff suppressed because it is too large Load Diff