Skip to content
Snippets Groups Projects
Commit e0a9d76f authored by nesdis's avatar nesdis
Browse files

Merge branch 'django30' of https://github.com/nesdis/djongo into docs

 Conflicts:
	.gitignore
	.travis.yml
	djongo/schema.py
	djongo/sql2mongo/query.py
	djongo/sql2mongo/sql_tokens.py
	docs/docs/integrating-django-with-mongodb.md
	tests/django_tests/runtests.py
	tests/django_tests/test_utils/test_runner.py
	tests/mock_tests/test_sqlparsing.py
	tox.ini
parents 6f15907d 486cbc53
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment