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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
environments	…
initializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
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	Fix bootsnap cache directory being declared relatively (#9511)	6 years ago
brakeman.ignore	…
database.yml	Remove PostgreSQL statement timeout (#9537)	6 years ago
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
puma.rb	…
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
secrets.yml	…
settings.yml	Add admin setting to disable followers count	6 years ago
sidekiq.yml	…
webpacker.yml	…