mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-04 14:04:39 +00:00
1488be7d96
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_conversation.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_identity_proof.rb | ||
| account_moderation_note.rb | ||
| account_pin.rb | ||
| account_stat.rb | ||
| account_tag_stat.rb | ||
| account_warning.rb | ||
| account_warning_preset.rb | ||
| admin.rb | ||
| application_record.rb | ||
| backup.rb | ||
| block.rb | ||
| bookmark.rb | ||
| context.rb | ||
| conversation.rb | ||
| conversation_mute.rb | ||
| custom_emoji.rb | ||
| custom_emoji_category.rb | ||
| custom_emoji_filter.rb | ||
| custom_filter.rb | ||
| direct_feed.rb | ||
| domain_allow.rb | ||
| domain_block.rb | ||
| email_domain_block.rb | ||
| export.rb | ||
| favourite.rb | ||
| featured_tag.rb | ||
| feed.rb | ||
| follow.rb | ||
| follow_request.rb | ||
| home_feed.rb | ||
| identity.rb | ||
| import.rb | ||
| instance.rb | ||
| instance_filter.rb | ||
| invite.rb | ||
| invite_filter.rb | ||
| list.rb | ||
| list_account.rb | ||
| list_feed.rb | ||
| media_attachment.rb | ||
| mention.rb | ||
| mute.rb | ||
| notification.rb | ||
| poll.rb | ||
| poll_vote.rb | ||
| preview_card.rb | ||
| relay.rb | ||
| remote_follow.rb | ||
| report.rb | ||
| report_filter.rb | ||
| report_note.rb | ||
| scheduled_status.rb | ||
| search.rb | ||
| session_activation.rb | ||
| setting.rb | ||
| site_upload.rb | ||
| status.rb | ||
| status_pin.rb | ||
| status_stat.rb | ||
| tag.rb | ||
| tombstone.rb | ||
| trending_tags.rb | ||
| user.rb | ||
| user_invite_request.rb | ||
| web.rb | ||