# Conflicts:
#   .flutter-plugins-dependencies

Merge branch 'dev-sidiq' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas into dev-sidiq

# Conflicts:
#   .flutter-plugins-dependencies
#   lib/main.dart
#   pubspec.yaml

# Conflicts:
#   .flutter-plugins-dependencies

Fungsionalitas PBI-4

See merge request !53

Fungsional Register dan Login

See merge request !52

Dev bayu

See merge request !51

Change sorting in fasilitas with radio button

See merge request !50

Merge branch 'PBI-3-registrasi_login' of https://gitlab.cs.ui.ac.id/ppl-fasilkom-ui/2020/ppl-c/dtb-beasiswa-miskin-dan-disabilitas/pplapangan-tembak-dtb-layanan-siswa-disabilitas into dev-sidiq

Merge remote-tracking branch 'origin/PBI-5-daftar_layanan_fasilitas_publik' into PBI-5-daftar_layanan_fasilitas_publik