mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-07 03:43:48 -05:00
40dd67056d
# Conflicts: # Pipfile.lock # app/main/forms.py # tests/app/main/views/accounts/test_choose_accounts.py # tests/app/main/views/organizations/test_organizations.py # tests/app/main/views/service_settings/test_service_settings.py # tests/app/main/views/test_add_service.py # tests/app/main/views/test_api_integration.py # tests/app/main/views/test_dashboard.py # tests/app/main/views/test_find_users.py # tests/app/main/views/test_index.py # tests/app/main/views/test_jobs.py # tests/app/main/views/test_platform_admin.py # tests/app/main/views/test_template_folders.py # tests/app/main/views/test_tour.py