Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into Features/VerifyVacancyForAdmin
# Conflicts: # assets/css/custom.css # assets/js/Dashboard.jsx # assets/js/VacancyPage.jsx # assets/js/components/TopMenu.jsx # assets/js/index.jsx
assets/js/CompanyPage.jsx
0 → 100644
assets/js/TranscriptPage.jsx
0 → 100644