Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| rules | ||
| configuration.js | ||
| development.js | ||
| production.js | ||
| shared.js | ||
| tests.js | ||
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| rules | ||
| configuration.js | ||
| development.js | ||
| production.js | ||
| shared.js | ||
| tests.js | ||