Merge branch 'master' into pyup-update-peewee-3.1.7-to-3.2.1

zdict · Mar 31, 2018 · f2e0797 · f2e0797
2 parents 93f5b56 + 35cf5e1
commit f2e0797
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Pipfile b/Pipfile
@@ -19,4 +19,4 @@ flake8 = "==3.4.1"
 pyjokes = "==0.5.0"
 pytest = "==3.5.0"
 pytest-cov = "==2.5.1"
-pytest-flake8 = "==1.0.0"
+pytest-flake8 = "==1.0.0"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 beautifulsoup4==4.6.0
 peewee==3.2.1
-requests==2.18.4
+requests==2.18.4