-
- Downloads
Merge branch 'UserStory2' of https://gitlab.com/PPL2017csui/PPLA1 into UserStory2
# Conflicts: # assets/js/components/VacancyList.jsx
Showing
- assets/js/Index.jsx 30 additions, 20 deletionsassets/js/Index.jsx
- assets/js/VacancyPage.jsx 28 additions, 14 deletionsassets/js/VacancyPage.jsx
- assets/js/components/Pane.jsx 1 addition, 1 deletionassets/js/components/Pane.jsx
- assets/js/components/Tabs.jsx 1 addition, 1 deletionassets/js/components/Tabs.jsx
- assets/js/components/VacancyList.jsx 23 additions, 8 deletionsassets/js/components/VacancyList.jsx
- assets/js/lib/Server.jsx 2 additions, 2 deletionsassets/js/lib/Server.jsx
- core/migrations/0003_auto_20170328_1400.py 33 additions, 0 deletionscore/migrations/0003_auto_20170328_1400.py
- core/migrations/0004_auto_20170328_1417.py 20 additions, 0 deletionscore/migrations/0004_auto_20170328_1417.py
- core/models/accounts.py 1 addition, 1 deletioncore/models/accounts.py
- core/models/vacancies.py 3 additions, 0 deletionscore/models/vacancies.py
- kape/urls.py 1 addition, 1 deletionkape/urls.py
Loading
Please register or sign in to comment