Merge branch 'master' into master

kraigb · web-flow · commit 5a0f9953109f · 2018-10-16T15:01:27.000-07:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -31,21 +31,6 @@
             ],
             "django": true
         },
-        {
-            "name": "Python: Flask",
-            "type": "python",
-            "request": "launch",
-            "module": "flask",
-            "env": {
-                "FLASK_APP": "app.py"
-            },
-            "args": [
-                "run",
-                "--no-debugger",
-                "--no-reload"
-            ],
-            "jinja": true
-        },
         {
             "name": "Python: Current File (External Terminal)",
             "type": "python",
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
-Django==2.1.2
+Django>=2.1.2
 pytz==2018.5
+Python==3.7
