Merge branch 'PBI-14-Agenda-Kegiatan' into 'dev-samuel-3'
# Conflicts: # informasi_fasilitas/urls.py # informasi_fasilitas/views_kegiatan.py
Fakultas Ilmu Komputer UI
# Conflicts: # informasi_fasilitas/urls.py # informasi_fasilitas/views_kegiatan.py
Excellence In Teamwork