diff options
| author | Jonas Liljestrand | 2012-11-19 11:38:35 +0100 |
|---|---|---|
| committer | Jonas Liljestrand | 2012-11-19 11:38:35 +0100 |
| commit | acc425e74ea305a565d59f517d6e5b83239848a5 (patch) | |
| tree | ddc5121c86f70f34046c6a7fdce9b8f87c87c0b2 | |
| parent | 0bcc840927ab08d0e7d64844f3242036a142113d (diff) | |
| parent | 0ce792eac2f234d3858ff9e892845715b7460a4f (diff) | |
| download | django-rest-framework-acc425e74ea305a565d59f517d6e5b83239848a5.tar.bz2 | |
Merge branch 'master' of https://github.com/jonlil/django-rest-framework
Conflicts:
rest_framework/authtoken/migrations/0001_initial.py
0 files changed, 0 insertions, 0 deletions