Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| remotable_spec.rb | ||
Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| remotable_spec.rb | ||