Fakultas Ilmu Komputer UI

Commit 79c68b7d authored by Muhammad Rafif Elfazri's avatar Muhammad Rafif Elfazri
Browse files

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

# Conflicts:
#   informasi_fasilitas/models.py
#   informasi_fasilitas/urls.py
#   informasi_fasilitas/views.py
parents 99952ed6 0aae65a3
Pipeline #81046 failed with stages
in 2 minutes and 22 seconds