Thibaut Girka dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.		2020-02-09 12:15:55 +01:00
..
environments
initializers	Add environment variable to specify extra data hosts	2020-02-06 12:15:15 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-09 12:15:55 +01:00
webpack
application.rb	Add kabyle language to Mastodon (#12962)	2020-01-26 14:42:35 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
pghero.yml
puma.rb
routes.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
secrets.yml
settings.yml	Merge branch 'master' into glitch-soc/master	2019-12-19 13:52:54 +01:00
sidekiq.yml
webpacker.yml