merged with main and resolved merge conflicts

This commit is contained in:
Alysia Broddrick 2023-05-31 15:10:54 -07:00
commit de24db0658
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
43 changed files with 1541 additions and 333 deletions

View file

@ -59,12 +59,12 @@ urlpatterns = [
),
path(
"application/<int:pk>/withdraw",
views.ApplicationWithdraw.as_view(),
views.ApplicationWithdrawConfirmation.as_view(),
name="application-withdraw-confirmation",
),
path(
"application/<int:pk>/withdrawconfirmed",
views.ApplicationWithdraw.updatestatus,
views.ApplicationWithdrawn.as_view(),
name="application-withdrawn",
),
path("health/", views.health),