mastodon/config
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
locales Add import/export feature for bookmarks (#14956) 2020-11-19 17:48:13 +01:00
locales-glitch Glitchsoc translation to 'es' language (#1439) 2020-10-19 22:17:29 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
application.rb Fix streaming API allowing connections to persist after access token invalidation (#15111) 2020-11-12 23:05:24 +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-10-21 19:10:50 +02:00
pghero.yml
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
sidekiq.yml
webpacker.yml