Fakultas Ilmu Komputer UI

Merge branches 'coldfix-sprint_4' and 'staging' of...

Merge branches 'coldfix-sprint_4' and 'staging' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/diskominfo-depok-tpu-online/post-rpl-web into coldfix-sprint_4

 Conflicts:
	package-lock.json
	src/component/Loader.jsx
3 jobs for coldfix-sprint_4 in 8 minutes and 19 seconds (queued for 1 second)