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

Browse Source

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency

...

This commit is contained in:

Thibaut Girka

2020-06-17 17:10:15 +02:00

parent 0a5cf075cd b1d492f30a

commit 59e92004b3

89 changed files with 1333 additions and 616 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

yarn.lock

+674 -559

File diff suppressed because it is too large Load Diff