symposion_app/symposion/schedule
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
..
tests schedule: add session and session role 2015-06-18 23:37:11 +09:00
__init__.py Namespace the apps 2014-12-18 08:19:01 -06:00
admin.py Merge pull request #100 from miurahr/python3_compatibility 2015-09-08 14:55:49 -05:00
apps.py python3 compatibility 2015-08-03 23:32:25 +09:00
forms.py python3 compatibility 2015-08-03 23:32:25 +09:00
helpers.py python3 compatibility 2015-08-03 23:32:25 +09: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
timetable.py python3 compatibility 2015-08-03 23:32:25 +09:00
urls.py python3 compatibility 2015-08-03 23:32:25 +09:00
views.py python3 compatibility 2015-08-03 23:32:25 +09:00