Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase with upstream #1

Merged
merged 29 commits into from
Oct 2, 2016
Merged

Rebase with upstream #1

merged 29 commits into from
Oct 2, 2016

Conversation

leotsem
Copy link
Owner

@leotsem leotsem commented Oct 2, 2016

No description provided.

lauxley and others added 29 commits December 1, 2015 20:45
Fix spelling errors here and there
Conflicts:
	django_elasticsearch/tests/test_qs.py
Conflicts:
	django_elasticsearch/managers.py
	django_elasticsearch/models.py
	django_elasticsearch/tests/test_indexable.py
	test_project/tox.ini
@leotsem leotsem merged commit a853eed into leotsem:master Oct 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants