mirror of https://framagit.org/tykayn/mastodon.git
249991c498
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller.rb | ||
| account_follow_controller.rb | ||
| account_unfollow_controller.rb | ||
| accounts_controller.rb | ||
| application_controller.rb | ||
| authorize_interactions_controller.rb | ||
| custom_css_controller.rb | ||
| directories_controller.rb | ||
| emojis_controller.rb | ||
| filters_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| home_controller.rb | ||
| instance_actors_controller.rb | ||
| intents_controller.rb | ||
| invites_controller.rb | ||
| manifests_controller.rb | ||
| media_controller.rb | ||
| media_proxy_controller.rb | ||
| public_timelines_controller.rb | ||
| relationships_controller.rb | ||
| remote_follow_controller.rb | ||
| remote_interaction_controller.rb | ||
| shares_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||