tests/models.py · 15c2c58b43a00ec29af99e0478b70eea57560fce · edx / django-rest-framework · GitLab

Blame History Permalink

Merge remote-tracking branch 'reference/master' into feature/pytest · 2aca69a9
```
Conflicts:
	tests/test_serializer.py
```
Xavier Ordoquy committed Apr 30, 2014
2aca69a9

models.py 4.89 KB