Merge branch 'v2-gamecard' into v2

# Conflicts: # config/settings/base.py
2022-06-09 18:46:30 -05:00
parent c1bbcc3623 abdab2d30b
commit a83bbffbfe
100 changed files with 1003 additions and 54 deletions
--- a/config/urls.py
+++ b/config/urls.py
@@ -17,6 +17,7 @@ urlpatterns = [
    path("accounts/", include("allauth.urls")),
    path("", include("teamsnap.urls")),
    path("", include("instagen.urls")),
+    path("", include("gamecard.urls")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)