0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-04 19:47:09 +00:00
mastodon/config
Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
locales Fix incorrect singular version of some translation strings () 2021-12-13 18:25:25 +01:00
locales-glitch Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2021-09-02 10:52:09 +02:00
application.rb Add S3_FORCE_SINGLE_REQUEST env var to work around S3 compatibility issues () 2021-10-18 18:29:04 +02:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 () 2021-09-19 14:42:32 +09:00
brakeman.ignore Add trending links () 2021-11-25 13:07:38 +01:00
database.yml
deploy.rb Change references to tootsuite/mastodon to mastodon/mastodon () 2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
pghero.yml
puma.rb
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
sidekiq.yml Add trending links () 2021-11-25 13:07:38 +01:00
storage.yml
webpacker.yml