6c99479ef4
Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well. |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller_spec.rb | ||
| oembed_controller_spec.rb | ||