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 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.		6 years ago
..
environments	…
initializers	…
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webpack	Merge branch '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	6 years ago
puma.rb	Improve ActiveRecord connection in on_worker_boot (#9238)	6 years ago
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
sidekiq.yml	…
webpacker.yml	Do not try to parse gif files as CSS or JS	6 years ago