konfigurasi/setting-wilayah

kurang function save. on progress
Setting Wilayah semuanya

Modul Setting Wilayah R
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/database.php
Synch Test

cant merge to master
Hendra Ganteng

Hendra tuh ganteng banget
Merge branch 'pr/11' into backup-master-18

Conflicts:
	app/models/Tmpemohon.php
	app/models/Tmpermohonan.php
	public/assets/controllers/PelayananCtrl.js
coba lagi

daftar pengaduan dan saran
tab nya jadi bisa tambah nd edit
Modal Pendataan Penjadwalan Tinjauan

Add Iframe Function
Merge branch 'pr/13' into backup-master-18

Conflicts:
	.gitignore
	app/config/database.php