Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into Features/CompanyBrowseByVacancy
# Conflicts: # assets/css/custom.css # assets/js/components/VacancyList.jsx # core/tests/test_vacancies.py
assets/js/SupervisorPage.jsx
0 → 100644