Fakultas Ilmu Komputer UI

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kape
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

37724d80

Commit 37724d80 authored 5 years ago by Benny William Pardede

Downloads
- Patches
- Plain Diff

Merge branch 'master' into '1606917550-40'

# Conflicts:
#   assets/js/__test__/ProfilePage-test.jsx

parent 005d0f20

No related branches found

No related tags found

1 merge request!1801606918446 155

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/ProfilePage.jsx 23 additions, 1 deletion

assets/js/ProfilePage.jsx
assets/js/__test__/ProfilePage-test.jsx 5 additions, 4 deletions

assets/js/__test__/ProfilePage-test.jsx
core/migrations/0020_merge_20191006_1508.py 16 additions, 0 deletions

core/migrations/0020_merge_20191006_1508.py
core/migrations/0038_merge_20191009_2309.py 16 additions, 0 deletions

core/migrations/0038_merge_20191009_2309.py
kape/settings.py 4 additions, 2 deletions

kape/settings.py

with 64 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment

Excellence In Teamwork