merge from main

This commit is contained in:
Kenneth Kehl
2023-08-25 08:57:24 -07:00
parent 1463d8421b
commit c6eb007386
29 changed files with 42 additions and 163 deletions

View File

@@ -14,10 +14,7 @@ from app import email_branding_client, status_api_client
from app.main import main
from app.main.forms import FieldWithNoneOption
from app.main.views.pricing import CURRENT_SMS_RATE
from app.main.views.sub_navigation_dictionaries import (
features_nav,
using_notify_nav,
)
from app.main.views.sub_navigation_dictionaries import features_nav, using_notify_nav
from app.utils.user import user_is_logged_in