Fakultas Ilmu Komputer UI

Commit 56136b55 authored by LUTHFI DZAKY SAIFUDDIN's avatar LUTHFI DZAKY SAIFUDDIN
Browse files

Merge branch 'master' into 'exercise_4'

# Conflicts:
#   functional_tests/tests.py
#   lists/templates/base.html
parents 1682d305 2b6bc7db
Pipeline #22519 passed with stages
in 14 minutes and 55 seconds