Merge branch 'master' into MatchScheduler

This commit is contained in:
Absurdon 2017-09-19 20:40:09 +02:00
commit 78efa98276

View file

@ -21,7 +21,7 @@
</div>
<div class="fields horizontal">
<%= f.label :country %>
<%= country_code_select :team, :country, [['EU', 'EU']] %>
<%= country_select :user, :country, include_blank: true %>
</div>
<div class="fields horizontal">
<%= f.label :comment %>