symposion_app/symposion
Patrick Altman 509e275706 Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit
Conflicts:
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
2015-09-08 15:03:06 -05:00
..
boxes python3 compatibility 2015-08-03 23:32:25 +09:00
cms python3 compatibility 2015-08-03 23:32:25 +09:00
conference Merge pull request #114 from uranusjr/timezone-field 2015-09-08 14:56:38 -05:00
locale add japanese translation 2015-06-21 12:51:36 +09:00
proposals python3 compatibility 2015-08-03 23:32:25 +09:00
reviews python3 compatibility 2015-08-03 23:32:25 +09:00
schedule Merge pull request #100 from miurahr/python3_compatibility 2015-09-08 14:55:49 -05:00
speakers python3 compatibility 2015-08-03 23:32:25 +09:00
sponsorship Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit 2015-09-08 15:03:06 -05:00
static drop old unused chosen 2015-07-11 16:02:35 +09:00
teams python3 compatibility 2015-08-03 23:32:25 +09: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 fix OrderedDict import error in Py2.6 2015-07-20 12:03:54 +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