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

Browse Source

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.

...

This commit is contained in:

Thibaut Girka

2020-11-12 22:13:57 +01:00

parent 67125534bc 9870b175b4

commit c077cdaba7

54 changed files with 1213 additions and 829 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

963

yarn.lock

File diff suppressed because it is too large Load Diff