Fakultas Ilmu Komputer UI

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

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
parents 54527864 3ecfd274
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 931 additions and 94 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Excellence In Teamwork