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

Browse Source

Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.

...

This commit is contained in:

Claire

2021-12-16 16:19:28 +01:00

parent d911c17f52 2aafa5b4e7

commit b2526316f5

41 changed files with 1046 additions and 773 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

911

yarn.lock

File diff suppressed because it is too large Load Diff