django-rest-framework/rest_framework/templates
Cezar Pendarovski f6cbd88618 Merge remote-tracking branch 'upstream/master' into fix-1719
Conflicts:
	rest_framework/templates/rest_framework/base.html
2014-08-25 17:28:22 +02:00
..
rest_framework Merge remote-tracking branch 'upstream/master' into fix-1719 2014-08-25 17:28:22 +02:00