Fakultas Ilmu Komputer UI

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

Merge branch 'UserStory3' of https://gitlab.com/PPL2017csui/PPLA1 into Features/ProfilePage

# Conflicts:
#	assets/css/custom.css
#	assets/js/index.jsx
parents 5b209db2 5dd947d2
Loading
Showing
with 516 additions and 470 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment