pasien dokter
Merge branch 'master' of github.com:Isht/apotek

Conflicts:
	assets/js/app/controller/getPlJual.js