Xavier Ordoquy d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini		2014-04-13 00:05:57 +02:00
..
api.html	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
base.html	Merge remote-tracking branch 'origin/master' into 2.4.0	2014-04-13 00:05:57 +02:00
form.html	Serializers can now be rendered directly to HTML	2013-10-02 13:45:35 +01:00
login_base.html	Drop 1.3 support	2013-09-25 10:30:04 +01:00
login.html	extend base login template	2013-04-17 10:15:02 -04:00
raw_data_form.html	Fix rendering of forms and add error rendering on HTML form	2013-10-02 16:13:34 +01:00