Jeremy Kescher a1a1d08890 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # Gemfile.lock		2022-12-16 17:53:33 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
initializers	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00
locales	Add explanation text to log-in page (#20946)	2022-12-15 16:44:29 +01:00
locales-glitch	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
application.rb	Add Western Frisian support (#18602)	2022-12-15 19:03:44 +01:00
boot.rb
brakeman.ignore
database.yml	Change postgres connection timeout (#21790)	2022-12-07 00:39:36 +01:00
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2022-11-12 10:17:22 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
pghero.yml
puma.rb
roles.yml
routes.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
secrets.yml
settings.yml
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	2022-12-16 17:53:33 +01:00
storage.yml
webpacker.yml