This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/config
Claire 2aadebc769 Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
2023-07-12 15:54:58 +02:00
..
environments
imagemagick
initializers Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream 2023-07-12 15:27:32 +02:00
locales
locales-glitch
routes
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
formatjs-formatter.js
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml