mirror of https://github.com/glitch-soc/mastodon
2810231180
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change. |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| claims_controller.rb | ||
| collections_controller.rb | ||
| followers_synchronizations_controller.rb | ||
| inboxes_controller.rb | ||
| outboxes_controller.rb | ||
| replies_controller.rb | ||