You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jeremy Kescher b221a857f7 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml		2 years ago
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
initializers	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
locales	New Crowdin updates (#20759)	2 years ago
locales-glitch	Remove glitch-soc-specific translations of upstreamed feature (domain block import)	2 years ago
webpack	…
application.rb	Fix `mailers` queue not being used for mailers (#20274)	2 years ago
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	Change `master` branch to `main` branch (#20290)	2 years ago
environment.rb	…
i18n-tasks.yml	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2 years ago
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
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)	2 years ago
secrets.yml	…
settings.yml	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
storage.yml	…
webpacker.yml	…