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

Browse Source

Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.

...

This commit is contained in:

Thibaut Girka

2020-08-01 20:24:23 +02:00

parent ab967cf5a0 bfd5aea206

commit 2cfa142961

50 changed files with 1202 additions and 986 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

4

app/javascript/styles/mastodon/boost.scss

File diff suppressed because one or more lines are too long