Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly. |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| claims_controller.rb | ||
| collections_controller.rb | ||
| followers_synchronizations_controller.rb | ||
| inboxes_controller.rb | ||
| outboxes_controller.rb | ||
| replies_controller.rb | ||