Merge branch 'master' of github.com:alexlovelltroy/django-mailbox

Browse source

Conflicts:
	django_mailbox/transports/gmail.py

...

This commit is contained in:

Alex Lovell-Troy 2014-05-13 02:04:46 +00:00

parent 668e33d25a c3239121a8

commit a59a10567c

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

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available