Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields

This commit is contained in:
James Mason 2017-12-07 09:30:52 -08:00 committed by GitHub
commit 9b32e9c165
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -165,7 +165,7 @@
%td= markdown(@event.abstract)
%tr
%td
%b Description
%b Requirements
%td= simple_format(@event.description)
- if @conference.program && @conference.program.rating && @conference.program.rating > 0