jyapayne/mongoengine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/lig/mongoengine into dev

Browse source 
Conflicts:
	.gitignore
This commit is contained in:
Harry Marr 2011-03-06 13:11:21 +00:00
commit 69171282e9
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,3 +1,5 @@
.*
!.gitignore
*.pyc
.*.swp
*.egg
@ -9,4 +11,4 @@ mongoengine.egg-info/
env/
.settings
.project
.pydevproject
.pydevproject