Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-10-03 12:26:17 +02:00
commit 4f0682fa41

View file

@ -14,7 +14,6 @@
= text_field_tag :email_admin, '', {class: 'form-control', = text_field_tag :email_admin, '', {class: 'form-control',
type: 'email', type: 'email',
placeholder: 'Email administrateur cible', placeholder: 'Email administrateur cible',
maxlength: 30,
style: 'width: 300px; margin-left:auto; margin-right:auto'} style: 'width: 300px; margin-left:auto; margin-right:auto'}
%div#not_found_admin.center.text-danger{style:'display:none; margin-top: 10px'} %div#not_found_admin.center.text-danger{style:'display:none; margin-top: 10px'}
Cet administrateur n'existe pas. Cet administrateur n'existe pas.