Fakultas Ilmu Komputer UI

Merge branch 'development' into 'PBI-12-info_kegiatan'

# Conflicts:
#   informasi_fasilitas/models.py
#   informasi_fasilitas/urls.py
#   informasi_fasilitas/views.py
3 jobs for PBI-12-info_kegiatan in 2 minutes and 22 seconds (queued for 2 seconds)