Skip to content

D
django-rest-framework
Commit acc425e7 by Jonas Liljestrand
Options

Merge branch 'master' of https://github.com/jonlil/django-rest-framework 

Conflicts:
	rest_framework/authtoken/migrations/0001_initial.py
parents 0bcc8409 0ce792ea
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment