django-rest-framework/rest_framework/templates/rest_framework
Tom Christie 34eb18b498 Merge branch 'master' into filters
Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py
2015-10-19 13:14:42 +01:00
..
admin Cleanup hyperlink rendering implementation 2015-06-03 11:47:33 +01:00
filters Translations for HTML filters 2015-08-28 14:55:22 +01:00
horizontal Docs for select cutoffs 2015-08-21 10:52:44 +01:00
inline Docs for select cutoffs 2015-08-21 10:52:44 +01:00
pagination Consistent 2 space tabbing and formatting 2015-06-18 09:00:05 -04:00
vertical Docs for select cutoffs 2015-08-21 10:52:44 +01:00
admin.html Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
api_form.html Consistent 2 space tabbing and formatting 2015-06-18 09:00:05 -04:00
api.html Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00
base.html Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
login_base.html Remove 'load url from future' tags in templates. 2015-07-30 15:14:02 +01:00
login.html extend base login template 2013-04-17 10:15:02 -04:00
raw_data_form.html Remove method and content overriding 2015-09-17 15:17:29 +01:00