Fakultas Ilmu Komputer UI

Commit 94a2db19 authored by Michael Wiryadinata Halim's avatar Michael Wiryadinata Halim
Browse files

Merge branches 'master' and 'staging' of...

Merge branches 'master' and 'staging' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/diskominfo-depok-tpu-online/post-rpl-mobile into staging

 Conflicts:
	android/fastlane/metadata/android/id/changelogs/changelogs.txt
	lib/home_industry_app.dart
parents b97796ec a3c1b29b
Pipeline #49833 passed with stages
in 22 minutes and 36 seconds