mastodon/config
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
…
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00
webpack
…
application.rb
…
boot.rb
…
brakeman.ignore
…
database.yml
…
deploy.rb
…
environment.rb
…
i18n-tasks.yml
…
navigation.rb
…
pghero.yml
…
puma.rb
…
routes.rb
…
secrets.yml
…
settings.yml
…
sidekiq.yml
…
webpacker.yml
…