Merge branch 'v2' into v2-gamechanger

# Conflicts:
#	config/settings/base.py
#	setup.cfg
#	teamsnap/migrations/0001_initial.py
This commit is contained in:
2022-06-10 11:45:32 -05:00
7 changed files with 277 additions and 226 deletions

View File

@@ -275,6 +275,7 @@ SOCIALACCOUNT_FORMS = {"signup": "benchcoach.users.forms.UserSocialSignupForm"}
INSTALLED_APPS += [
"teamsnap",
"instagen",
"gamecard",
"gamechanger",
"teamsnap.lineup",
"teamsnap.dashboard",