mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-29 05:43:40 +01:00
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 | ||
connection_pool | ||
ostatus | ||
proof_provider/keybase | ||
settings | ||
delivery_failure_tracker_spec.rb | ||
extractor_spec.rb | ||
feed_manager_spec.rb | ||
formatter_spec.rb | ||
hash_object_spec.rb | ||
language_detector_spec.rb | ||
request_pool_spec.rb | ||
request_spec.rb | ||
sanitize_config_spec.rb | ||
spam_check_spec.rb | ||
status_filter_spec.rb | ||
status_finder_spec.rb | ||
tag_manager_spec.rb | ||
user_settings_decorator_spec.rb | ||
webfinger_resource_spec.rb |