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

Merge branch 'master' into dev

Browse source 
Conflicts:
	docs/guide/signals.rst
	python-mongoengine.spec
This commit is contained in:
Ross Lawley 2012-01-16 09:05:38 +00:00
commit 90bfa608dd
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/guide/signals.rst
View file

@ -9,7 +9,11 @@ Signal support is provided by the excellent `blinker`_ library and
will gracefully fall back if it is not available.
<<<<<<< HEAD
The following document signals exist in MongoEngine and are pretty self explanatory:
=======
The following document signals exist in MongoEngine and are pretty self-explanatory:
>>>>>>> master
* `mongoengine.signals.pre_init`
* `mongoengine.signals.post_init`