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 c40b063bd4 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # .github/workflows/build-image.yml # lib/mastodon/version.rb		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	…
locales-glitch	Add back missing glitch-soc admin settings (#1919)	2 years ago
webpack	…
application.rb	…
boot.rb	…
brakeman.ignore	…
database.yml	…
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	…
pghero.yml	…
puma.rb	…
roles.yml	…
routes.rb	Add back missing glitch-soc admin settings (#1919)	2 years ago
secrets.yml	…
settings.yml	…
sidekiq.yml	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
storage.yml	…
webpacker.yml	…