robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 10:54:31 +00:00
Code Activity
Files
51f178ddd6bf65db18a2ce060c55084a87e58f1a
education-project/routes/api.php
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

5.1 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink