Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-12-01 11:00:07 +01:00
commit bf8d2f0f20

View file

@ -1 +1,2 @@
= render partial: 'users/description/champs/drop_down_template', locals: {values: champ.drop_down_list.options, champ: champ}
- unless champ.drop_down_list.nil?
= render partial: 'users/description/champs/drop_down_template', locals: {values: champ.drop_down_list.options, champ: champ}