Stephan Groß 6ba4df8a27 Merge remote-tracking branch 'upstream/master' into regex_field ... Conflicts: docs/topics/release-notes.md		2012-11-21 11:56:34 +01:00
..
api-guide	Merge remote-tracking branch 'upstream/master' into regex_field	2012-11-21 11:56:34 +01:00
css	Make settings consistent with corrosponding view attributes	2012-10-17 23:09:11 +01:00
img	Tweak static files with docs	2012-10-09 14:12:38 +01:00
js	Tweak static files with docs	2012-10-09 14:12:38 +01:00
topics	Merge remote-tracking branch 'upstream/master' into regex_field	2012-11-21 11:56:34 +01:00
tutorial	Missing import of "Permission" model in docs	2012-11-17 04:03:43 +04:00
index.md	Docs, tox and travis use django-filter 0.5.4	2012-11-16 20:58:49 +00:00
requirements.txt	Add basic serializer tests	2012-09-07 15:14:23 +01:00
template.html	Add filtering into documentation	2012-11-07 21:28:10 +00:00