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 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		5 years ago
..
environments	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
initializers	Fix connect-src policy for Tesseract	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
webpack	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	Use the bundled Capistrano version (#9855)	6 years ago
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
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	Add `tootctl preview_cards remove` (#11320)	5 years ago
webpacker.yml	…