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

Browse Source

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

...

This commit is contained in:

Thibaut Girka

2019-06-03 14:54:30 +02:00

parent 35c4ff07f4 f2f5c1bd6d

commit 76918554a6

18 changed files with 896 additions and 846 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

1513

yarn.lock

File diff suppressed because it is too large Load Diff