gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix_datetimepicker_navigation_for_conference_startend_fields

Browse source
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
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/events/_proposal.html.haml
View file

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