Christian Bruckmayer 28e55f3f50 Merge pull request #737 from ChrisBr/commercial_new ... Simplify adding commercials to conference and event		2016-01-21 20:29:03 +01:00
..
assets	Implement simplified commercials workflow	2016-01-21 19:41:12 +01:00
controllers	Merge pull request #737 from ChrisBr/commercial_new	2016-01-21 20:29:03 +01:00
helpers	updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper	2015-09-21 15:56:57 +02:00
mailers	added more consistency for email_settings	2015-10-14 15:34:23 +02:00
models	Implement simplified commercials workflow	2016-01-21 19:41:12 +01:00
serializers	Fix Hakiri issues	2014-08-27 16:18:35 +02:00
views	Implement simplified commercials workflow	2016-01-21 19:41:12 +01:00