django-rest-framework/rest_framework, branch model-serializer-caching Web APIs for Django. Resolve merge conflict 2015-02-06T14:35:06+00:00 Tom Christie 2015-02-06T14:35:06+00:00 3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 






Upgrade pending deprecations to deprecations
2015-02-06T13:21:35+00:00

Tom Christie

2015-02-06T13:21:35+00:00

1f996128458570a909d13f15c3d739fb12111984












Fix possible nested array fields
2015-02-05T14:12:14+00:00

José Padilla

2015-02-05T14:12:14+00:00

c696b0ba0ced9527c8f4ad1bf6f71546d8fa65c2












Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
2015-02-05T03:34:20+00:00

José Padilla

2015-02-05T03:34:20+00:00

720d154c832794e42e23c3ba2fe7b835d4baf386












Add child to ListField when using ArrayField
2015-02-05T03:33:59+00:00

José Padilla

2015-02-05T03:33:59+00:00

48fa77c09e2198c7877a724a46230caedcc7b529












Fix NamespaceVersioning with hyperlinked serializer fields
2015-02-05T00:58:09+00:00

Tom Christie

2015-02-05T00:58:09+00:00

e1c45133126e0c47b8470b4cf7a43c6a7f4fca43












Merge branch 'version-3.1-2489' of git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489
2015-02-04T23:32:48+00:00

Tom Christie

2015-02-04T23:32:48+00:00

83673e8f74abc6dfd77e9b87eca6da9ec319da2b












Minor authentication message improvement.
2015-02-04T09:07:10+00:00

Tom Christie

2015-02-04T09:07:10+00:00

8b4ce5c636a9abb33029e48f969bbdf38f97ca1f












Provide rest_framework.resolve. Fixes #2489
2015-02-03T04:37:33+00:00

Brandon Cazander

2015-01-29T01:08:34+00:00

77d061d234e03004f34058028707ecddfc730fae












Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
2015-02-01T19:34:33+00:00

José Padilla

2015-02-01T19:34:33+00:00

b844cc4bb6b53e2bac4ce1351b22f44a82b7b937

Conflicts:
	rest_framework/serializers.py





Conflicts:
	rest_framework/serializers.py