symposion_app/symposion
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
..
boxes Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
cms Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
conference Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
locale add japanese translation 2015-06-21 12:51:36 +09:00
proposals Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
reviews Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
schedule Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
speakers Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
sponsorship Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
static drop old unused chosen 2015-07-11 16:02:35 +09:00
teams Merge branch 'i18n-all' of https://github.com/miurahr/symposion into miurahr-i18n-all 2015-09-08 15:07:24 -05:00
utils Fix flake8 warnings 2014-07-30 15:19:26 -03:00
__init__.py bump version for dev 2013-03-14 04:56:04 -04:00
conf.py Ignore linting the settings import 2014-12-18 08:19:01 -06:00
forms.py i18n all part 2015-08-03 23:37:33 +09:00
markdown_parser.py python3 compatibility 2015-08-03 23:32:25 +09:00
models.py add blank models.py to symposion 2012-08-14 04:20:46 -04:00
views.py python3 compatibility 2015-08-03 23:32:25 +09:00