Henne Vogelsang 5a0328842e Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page		2016-06-30 13:04:28 +02:00
..
assets	Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page	2016-06-30 13:04:28 +02:00
controllers	Merge pull request #1034 from Ana06/statistic	2016-06-30 12:25:59 +02:00
helpers	Schedule height fits a 600px screen and the schedule is hiden if there is only one room	2016-06-27 18:24:47 +02:00
jobs	Use ActiveJob to send comment mails	2016-04-22 11:31:19 +02:00
mailers	Adapt the mailbot spec to the last changes	2016-04-22 14:53:10 +02:00
models	Merge pull request #1034 from Ana06/statistic	2016-06-30 12:25:59 +02:00
serializers	Use PictureUploader on Conference	2016-04-27 17:40:23 +02:00
uploaders	Give a bit more demo info in the conference description	2016-05-03 16:25:39 +02:00
views	Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page	2016-06-30 13:04:28 +02:00