Fakultas Ilmu Komputer UI

Commit 9768ce91 authored by Syahrul Findi's avatar Syahrul Findi
Browse files

Merge branch 'master' into 'latihan2'

# Conflicts:
#   functional_test.py
#   latihan2/templates/home.html
#   latihan2/tests.py
parents 385a56f1 908534e9
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment