merged main and resolved conflict

This commit is contained in:
Alysia Broddrick 2024-06-11 13:07:21 -07:00
commit 1c1ae51023
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
14 changed files with 461 additions and 110 deletions

View file

@ -660,6 +660,8 @@ ALLOWED_HOSTS = [
"getgov-staging.app.cloud.gov",
"getgov-development.app.cloud.gov",
"getgov-ag.app.cloud.gov",
"getgov-litterbox.app.cloud.gov",
"getgov-hotgov.app.cloud.gov",
"getgov-cb.app.cloud.gov",
"getgov-bob.app.cloud.gov",
"getgov-meoward.app.cloud.gov",