Merge branch 'main' of https://github.com/GSA/notifications-admin into 686-remove-uk-styles

# Conflicts:
#	app/templates/views/service-settings/set-sms.html
This commit is contained in:
Jonathan Bobel
2023-08-08 16:49:56 -04:00
6 changed files with 175 additions and 136 deletions

View File

@@ -3059,7 +3059,7 @@ def test_unknown_channel_404s(
), [
(
'sms',
'You have a free allowance of 250,000 text messages each financial year.',
'You may send up to 250,000 text messages during the pilot period.',
'Send text messages',
[],
'False',