mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-26 20:43:42 +01: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_relationships_presenter_spec.rb | ||
familiar_followers_presenter_spec.rb | ||
instance_presenter_spec.rb | ||
status_relationships_presenter_spec.rb |