Merge branch 'master' into glitch-soc/master

Browse Source

Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.

...

This commit is contained in:

Thibaut Girka

2020-01-20 15:00:22 +01:00

parent ddcf78d8d3 51182843d4

commit 45709d6987

17 changed files with 812 additions and 699 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

1302

yarn.lock

File diff suppressed because it is too large Load Diff