You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... 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		5 years ago
..
environments	…
initializers	…
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	6 years ago
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
sidekiq.yml	…
webpacker.yml	…