Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-27 17:58:44 +02:00
locales	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
locales-glitch
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-25 10:44:06 +02:00
application.rb	New Crowdin updates (#16269)	2021-05-20 00:19:52 +02:00
boot.rb
brakeman.ignore	Ignore brakeman false positive warning (#16213)	2021-05-11 14:18:33 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-23 10:46:24 +02:00
pghero.yml
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
sidekiq.yml
storage.yml
webpacker.yml