Patrick Altman 67433cacb4 Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all ... Conflicts: symposion/boxes/models.py symposion/conference/models.py symposion/schedule/models.py symposion/speakers/models.py symposion/sponsorship/admin.py symposion/sponsorship/models.py symposion/teams/models.py		2015-09-08 15:07:24 -05:00
..
templatetags	Fix flake8 warnings	2014-07-30 15:19:26 -03:00
__init__.py	Namespace the apps	2014-12-18 08:19:01 -06:00
admin.py	Fix flake8 warnings	2014-07-30 15:19:26 -03:00
backends.py	Fix flake8 warnings	2014-07-30 15:19:26 -03:00
forms.py	Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all	2015-09-08 15:07:24 -05:00
models.py	Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all	2015-09-08 15:07:24 -05:00
urls.py	Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility	2014-12-15 15:15:46 -06:00
views.py	Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all	2015-09-08 15:07:24 -05:00