Patrick Altman 8a95b0861c Merge branch 'master' into schedule-admin ... Conflicts: symposion/schedule/admin.py		2015-09-08 14:51:49 -05:00
..
boxes	Namespace the apps	2014-12-18 08:19:01 -06:00
cms	Namespace the apps	2014-12-18 08:19:01 -06:00
conference	admin: inline edit section	2015-08-01 13:00:22 +09:00
locale	add japanese translation	2015-06-21 12:51:36 +09:00
proposals	add more addtitional speakers constraints	2015-07-31 09:25:46 +09:00
reviews	Merge pull request #79 from miurahr/show-review-result	2015-06-18 23:00:27 -05:00
schedule	Merge branch 'master' into schedule-admin	2015-09-08 14:51:49 -05:00
speakers	Return unicode from _unicode_ methods	2015-05-25 08:35:55 +09:00
sponsorship	Merge pull request #85 from miurahr/export_sponsor_zip	2015-08-03 08:01:44 -05:00
static	drop old unused chosen	2015-07-11 16:02:35 +09:00
teams	Namespace the apps	2014-12-18 08:19:01 -06: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	Fix flake8 warnings	2014-07-30 15:19:26 -03:00
models.py	add blank models.py to symposion	2012-08-14 04:20:46 -04:00
views.py	Fix flake8 warnings	2014-07-30 15:19:26 -03:00