mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 08:08:07 +01:00
3e686beaea
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. |
||
---|---|---|
.. | ||
account_moderation_note_policy_spec.rb | ||
account_policy_spec.rb | ||
backup_policy_spec.rb | ||
custom_emoji_policy_spec.rb | ||
domain_block_policy_spec.rb | ||
email_domain_block_policy_spec.rb | ||
instance_policy_spec.rb | ||
invite_policy_spec.rb | ||
relay_policy_spec.rb | ||
report_note_policy_spec.rb | ||
report_policy_spec.rb | ||
settings_policy_spec.rb | ||
status_policy_spec.rb | ||
subscription_policy_spec.rb | ||
tag_policy_spec.rb | ||
user_policy_spec.rb |