Fakultas Ilmu Komputer UI

Skip to content
Snippets Groups Projects
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
1 merge request!66Pbi 12 info kegiatan
Pipeline #81046 failed
Showing
with 168 additions and 103 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment