Merge branch 'master' into handle_merge_conflicts
This commit is contained in:
commit
1f3feeb0c9
4 changed files with 15 additions and 1 deletions
|
|
@ -5,7 +5,7 @@ class EventSerializer < ActiveModel::Serializer
|
|||
|
||||
def date
|
||||
t = object.start_time
|
||||
t.blank? ? '' : %{ #{t.time.strftime('%Y-%m-%dT%H:%M:%S')}#{t.formatted_offset(false)} }
|
||||
t.blank? ? '' : %{ #{l t , format: :short}#{t.formatted_offset(false)} }
|
||||
end
|
||||
|
||||
def speaker_ids
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue