mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09:00
30ee7339d3
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 |