Merge branch 'master' into dev

# Conflicts:
#	benchcoach/forms.py
#	benchcoachproject/settings.py
#	teamsnap/forms.py
This commit is contained in:
2021-12-22 08:27:27 -06:00

View File

@@ -14,5 +14,4 @@ soupsieve==2.2.1
sqlparse==0.4.1 sqlparse==0.4.1
urllib3==1.26.6 urllib3==1.26.6
zipp==3.5.0 zipp==3.5.0
django-crispy-forms
psycopg2 psycopg2