From: Abhishek Kumar Singh <abhishek4bhopati@gmail.com>
Date: Mon, 7 Mar 2016 06:21:09 +0000 (+0530)
Subject: Merge branch 'master' of github.com:github/gitignore into patch-1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=83656adb097d1e5fb674918287c2af3459ed7fce;p=gitignore.git

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

Conflicts:
	Python.gitignore
---

83656adb097d1e5fb674918287c2af3459ed7fce
diff --cc Python.gitignore
index 59678313,4f823c47..908a064b
--- a/Python.gitignore
+++ b/Python.gitignore
@@@ -68,5 -71,8 +71,11 @@@ target
  # pyenv
  .python-version
  
 +# celery beat schedule file
 +celerybeat-schedule
++
+ # dotenv
+ .env
+ 
+ # Spyder project settings
+ .spyderproject