Merge commit '2fe1b8d169' into glitch-soc/merge-upstream

Browse source

Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests.

...

This commit is contained in:

Claire 2024-05-06 17:53:51 +02:00

parent e9cca1cc09 2fe1b8d169

commit 016d194274

58 changed files with 1577 additions and 374 deletions

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

589

yarn.lock

View file

File diff suppressed because it is too large Load diff