mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-13 04:29:03 +01:00
0437d70628
Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes. |
||
---|---|---|
.. | ||
base_controller.rb | ||
claims_controller.rb | ||
collections_controller.rb | ||
followers_synchronizations_controller.rb | ||
inboxes_controller.rb | ||
outboxes_controller.rb | ||
replies_controller.rb |