Merge branch 'development' into 'PBI-12-info_kegiatan'
# Conflicts: # informasi_fasilitas/models.py # informasi_fasilitas/urls.py # informasi_fasilitas/views.py
Fakultas Ilmu Komputer UI
# Conflicts: # informasi_fasilitas/models.py # informasi_fasilitas/urls.py # informasi_fasilitas/views.py