Merge branch 'master' of https://github.com/lig/mongoengine into dev
Conflicts: .gitignore
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,3 +1,5 @@
|
||||
.*
|
||||
!.gitignore
|
||||
*.pyc
|
||||
.*.swp
|
||||
*.egg
|
||||
@@ -9,4 +11,4 @@ mongoengine.egg-info/
|
||||
env/
|
||||
.settings
|
||||
.project
|
||||
.pydevproject
|
||||
.pydevproject
|
||||
|
Reference in New Issue
Block a user