d8b0a732aa
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| _domain_block.html.haml | ||
| import.html.haml | ||
| new.html.haml | ||