mastodon/config
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
initializers Fix connect-src policy for Tesseract 2019-08-19 22:02:35 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
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 2019-08-06 13:16:53 +02:00
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
sidekiq.yml
webpacker.yml