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 | ||
| direct_controller.rb | ||
| home_controller.rb | ||
| list_controller.rb | ||
| public_controller.rb | ||
| tag_controller.rb | ||