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

Browse Source

Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.

...

This commit is contained in:

Thibaut Girka

2020-06-30 23:00:20 +02:00

parent 10ede3eb27 65506bac3f

commit 9c3b9d5ab9

83 changed files with 2766 additions and 987 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

1242

yarn.lock

File diff suppressed because it is too large Load Diff