Merge branch 'main' into 'trigger4'

.gitlab-ci.yml

Procfile

account/forms.py

account/views.py

sirest/settings.py

templates/navbar.html

trigger5/migrations/0001_initial.py

trigger5/migrations/0002_alter_kategoriresto_title.py

...r5/migrations/0003_rename_title_kategoriresto_kategori.py

trigger5/templates/buat_bahanmakanan.html

trigger5/templates/buat_kategori.html

trigger5/templates/daftar_bahanmakanan.html

trigger5/templates/daftar_kategori.html

trigger5/templates/detail_pemesanan_kurir.html

trigger5/templates/pemesanan_kurir.html

trigger5/urls.py

trigger5/views.py

trigger_2/forms.py

trigger_2/views.py

trigger_6/templates/daftar_promo.html