mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-15 12:44:24 -05:00
e0eebba461
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml |
||
|---|---|---|
| .. | ||
| _follow_button.html.haml | ||
| _follow_grid_hidden.html.haml | ||
| _follow_grid.html.haml | ||
| _grid_card.html.haml | ||
| _header.html.haml | ||
| _moved_strip.html.haml | ||
| _nothing_here.html.haml | ||
| _og.html.haml | ||
| show.html.haml | ||