mastodon/config
Thibaut Girka be4849c083 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-12-12 15:40:06 +01:00
locales
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