mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 08:54:40 +00:00
16d5217502
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| application_policy.rb | ||
| backup_policy.rb | ||
| custom_emoji_policy.rb | ||
| domain_block_policy.rb | ||
| email_domain_block_policy.rb | ||
| instance_policy.rb | ||
| invite_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| settings_policy.rb | ||
| status_policy.rb | ||
| subscription_policy.rb | ||
| user_policy.rb | ||