Merge branch 'master' of github.com:github/gitignore into patch-1

Conflicts: Python.gitignore
2016-03-07 11:51:09 +05:30
parent a623e9e6d4 028ed4e1b1
commit 83656adb09
25 changed files with 143 additions and 47 deletions
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -56,6 +56,9 @@ local_settings.py
 # Flask instance folder
 instance/

+# Scrapy stuff:
+.scrapy
+
 # Sphinx documentation
 docs/_build/

@@ -70,3 +73,9 @@ target/

 # celery beat schedule file
 celerybeat-schedule
+
+# dotenv
+.env
+
+# Spyder project settings
+.spyderproject