Stefano Brentegani fb6b35a724 Merge branch 'master' into custom-staff-filter ... Conflicts: docs/settings.rst helpdesk/views/staff.py		2014-07-22 06:47:50 +02:00
..
api.rst	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00
conf.py	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00
configuration.rst	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00
contributing.rst	Tidy up docs & add documentation about settings	2012-08-08 15:21:29 +10:00
custom_fields.rst	Tidy up docs & add documentation about settings	2012-08-08 15:21:29 +10:00
index.rst	Tidy up docs & add documentation about settings	2012-08-08 15:21:29 +10:00
install.rst	Replace django.contrib.markup with django-markdown-deux. Closes #219.	2014-07-07 12:10:53 +10:00
license.rst	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00
Makefile	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00
settings.rst	Merge branch 'master' into custom-staff-filter	2014-07-22 06:47:50 +02:00
spam.rst	Remove doctrees & html docs; moved reStructuredText files from docs/source/ to docs/ to make it a little easier for most people to access.	2011-02-14 22:03:09 +00:00