Merge branch 'master' into add_lineup

2021-11-11 20:46:03 -06:00
parent 3e12360c12 a4f9852c36
commit 7bc4e540ad
3 changed files with 2 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 __pycache__
 db.sqlite3
 media
+/data

 # Backup files #
 *.bak
--- a/benchcoach/settings.py
+++ b/benchcoach/settings.py
@@ -26,8 +26,7 @@ SECRET_KEY = 'django-insecure-qib_j&47o$5l3*gi7y#8#3pjh_88sfdqn@dmp&gx+2)&1nzmor
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

-ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1"]
-
+ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1", "10.0.1.4", "benchcoach.ascorrea.com"]

 # Application definition

--- a/players/fixtures/sample_players.yaml
+++ b/players/fixtures/sample_players.yaml
@@ -5,7 +5,6 @@
    last_name: Tosser
    jersey_number: 1
    team: 1
-    team: 1
 - model: players.player
  pk: 2
  fields: