Merge branch 'master' of github.com:arbaal/mongoengine

Browse Source

Conflicts:
	mongoengine/django/sessions.py

Signed-off-by: Nils Hasenbanck <nils@hasenbanck.de>

...

This commit is contained in:

Nils Hasenbanck 2012-03-24 19:49:02 +01:00

parent 421f324f9e 8fe4a70299

commit 712e8a51e4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available