Merge branch 'v2' into gamecard

# Conflicts:
#	benchcoach/static/css/gamecard.css
#	benchcoach/static/fonts/dinpro/dinpro.css
#	benchcoach/static/fonts/m+1m/m+1m.css
#	benchcoach/static/fonts/m+1m/mplus-1m-bold-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-light-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-medium-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-regular-webfont.woff
#	benchcoach/static/fonts/m+1m/mplus-1m-thin-webfont.woff
#	benchcoach/static/fonts/refrigerator/refigerator.css
#	benchcoach/static/fonts/vera/Vera-Bold-Italic-webfont.woff
#	benchcoach/static/fonts/vera/Vera-Bold-webfont.woff
#	benchcoach/static/fonts/vera/Vera-Italic-webfont.woff
#	benchcoach/static/fonts/vera/Vera-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Bold-Italic-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Bold-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-Italic-webfont.woff
#	benchcoach/static/fonts/vera/VeraMono-webfont.woff
#	benchcoach/static/fonts/vera/bitstreamvera.css
#	benchcoach/static/fonts/verdana/VerdanaPro-Black.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-BlackItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Bold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-BoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBlack.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBlackItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondBoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondLight.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondLightItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondRegular.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondSemiBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-CondSemiBoldItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Italic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Light.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-LightItalic.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-Regular.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-SemiBold.ttf
#	benchcoach/static/fonts/verdana/VerdanaPro-SemiBoldItalic.ttf
#	benchcoach/static/fonts/verdana/verdanapro.css
#	benchcoachproject/static/css/base.css
#	teamsnap/templates/lineup/gamecard.html
#	teamsnap/urls.py
#	teamsnap/views.py
This commit is contained in:
2022-06-07 18:31:38 -05:00
533 changed files with 5402 additions and 28338 deletions

View File

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.