Merge branch 'main' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

...

This commit is contained in:

Claire

2021-10-25 20:28:51 +02:00

parent c647fa99ca 5ba46952af

commit e855df149b

258 changed files with 12765 additions and 4746 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

846

yarn.lock

File diff suppressed because it is too large Load Diff