Scott Sadler e82c17567a Merge branch 'master' into django-1.8 ... Conflicts: helpdesk/tests/__init__.py		2015-11-06 14:50:33 +01:00
..
__init__.py	Moved all project files under a "helpdesk" directory. Should make it easier to use setup.py / pypi / whatever in the future.	2011-01-25 23:02:00 +00:00
api.py	Remove extra space line	2015-04-14 16:29:47 -04:00
feeds.py	Improved support for custom user models	2014-10-22 16:18:04 +11:00
kb.py	small fixes and translation	2011-09-01 13:01:03 +02:00
public.py	Merge	2015-04-28 09:13:54 +10:00
staff.py	Merge branch 'master' into django-1.8	2015-11-06 14:50:33 +01:00