mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 02:50:14 -05:00
c077cdaba7
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. |
||
|---|---|---|
| .. | ||
| admin | ||
| settings | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| domain_control_helper.rb | ||
| flashes_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| webfinger_helper.rb | ||