Fakultas Ilmu Komputer UI

Commit 45164e21 authored by Kevin Albert Simanjuntak's avatar Kevin Albert Simanjuntak
Browse files

Merge branch '1606835595-242' into 'master'

fix conflict

See merge request !293
parents 3a42dde1 52100f2b
Pipeline #26911 passed with stages
in 13 minutes and 24 seconds