Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.

...

This commit is contained in:

Claire committed 2024-01-11 12:59:27 +01:00

2 parents e5b97eadd5 9a73a7dcaf

commit 630b245bb4

17 files changed

+207 -326

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/mastodon/locales/fr-QC.json → app/javascript/mastodon/locales/fr-CA.json

File renamed without changes.