mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
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. |
||
|---|---|---|
| .. | ||
| account_counters_spec.rb | ||
| account_finder_concern_spec.rb | ||
| account_interactions_spec.rb | ||
| remotable_spec.rb | ||
| status_threading_concern_spec.rb | ||