Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| components | ||
| follows.jsx | ||
| index.jsx | ||
| share.jsx | ||
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| components | ||
| follows.jsx | ||
| index.jsx | ||
| share.jsx | ||