Adam Ness 5311cc1012 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework		2012-07-02 18:44:00 -07:00
..
runtests	Massive merge	2012-02-25 18:45:17 +00:00
static/djangorestframework/css	Move stylesheet references to the new relative namespace	2012-02-14 14:50:11 +09:00
templates/djangorestframework	Massive merge	2012-02-25 18:45:17 +00:00
templatetags	Merging master into develop	2012-02-21 20:12:14 +00:00
tests	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
utils	Merge with master	2012-04-11 15:28:57 +01:00
__init__.py	Massive merge	2012-02-25 18:45:17 +00:00
authentication.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
compat.py	Fixes #94. Thanks @natim. Only Markdown 2.0+ is supported currently.	2012-04-11 23:13:04 +02:00
mixins.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
models.py	Revert unwanted checkin of models.py	2011-03-03 09:05:27 +00:00
parsers.py	Merge with master	2012-04-11 15:28:57 +01:00
permissions.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
renderers.py	Massive merge	2012-02-25 18:45:17 +00:00
request.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
resources.py	Let the resources search up the stack for views if they don't get one. This lets nested resources access request variables	2012-06-03 02:46:40 -07:00
response.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00
reverse.py	Massive merge	2012-02-25 18:45:17 +00:00
serializer.py	Merge branch 'master' of git://github.com/tomchristie/django-rest-framework	2012-07-02 18:44:00 -07:00
status.py	Drop redundant comment.	2012-01-24 17:53:54 +00:00
urls.py	Massive merge	2012-02-25 18:45:17 +00:00
views.py	Merge work from sebpiq	2012-04-11 17:38:47 +01:00