Fakultas Ilmu Komputer UI

Skip to content
Snippets Groups Projects
Commit 3f7fc64b authored by M. Reza Qorib's avatar M. Reza Qorib
Browse files

Bismillah :")

Merge branch 'develop' of https://gitlab.com/PPL2017csui/PPLA1 into Features/HomeDosen

# Conflicts:
#	assets/css/custom.css
#	assets/js/ProfilePage.jsx
#	assets/js/VacancyPage.jsx
#	assets/js/__test__/components/AdminVacancy-test.jsx
#	assets/js/__test__/components/VacancyList-test.jsx
#	assets/js/components/AdminVacancy.jsx
#	assets/js/components/TopMenu.jsx
#	assets/js/index.jsx
#	core/lib/permissions.py
#	core/serializers/vacancies.py
#	core/tests/test_vacancies.py
#	core/views/vacancies.py
parents 8a177f53 4b65b513
No related branches found
No related tags found
Loading
Showing
with 572 additions and 165 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment