mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 17:21:36 +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 |
||
|---|---|---|
| .. | ||
| backup_cleanup_scheduler.rb | ||
| doorkeeper_cleanup_scheduler.rb | ||
| email_scheduler.rb | ||
| feed_cleanup_scheduler.rb | ||
| ip_cleanup_scheduler.rb | ||
| media_cleanup_scheduler.rb | ||
| pghero_scheduler.rb | ||
| preview_cards_cleanup_scheduler.rb | ||
| scheduled_statuses_scheduler.rb | ||
| subscriptions_cleanup_scheduler.rb | ||
| subscriptions_scheduler.rb | ||
| user_cleanup_scheduler.rb | ||