Merge branch 'staging'

This commit is contained in:
Simon Lehericey 2017-05-16 14:55:16 +02:00
commit c670d6ff26

View file

@ -15,7 +15,7 @@
- unless admin.last_sign_in_at.nil? - unless admin.last_sign_in_at.nil?
= time_ago_in_words(l(admin.last_sign_in_at, format: "%d/%m/%Y %H:%M UTC +02:00")) = time_ago_in_words(l(admin.last_sign_in_at, format: "%d/%m/%Y %H:%M UTC +02:00"))
( (
= admin.last_sign_in_at.to_date.localtime.strftime('%d/%m/%Y') = admin.last_sign_in_at.localtime.strftime('%d/%m/%Y')
) )
%td %td
= admin.procedures.where(published: true).count = admin.procedures.where(published: true).count