Fakultas Ilmu Komputer UI

Merge branch 'PBI-14-Agenda_Kegiatan' into 'dev-samuel-2'

# Conflicts:
#   informasi_fasilitas/test_base.py
#   informasi_fasilitas/test_views_kegiatan.py
3 jobs for dev-samuel-2 in 3 minutes and 11 seconds (queued for 2 seconds)