ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| base_controller.rb | ||
| collections_controller.rb | ||
| followers_synchronizations_controller.rb | ||
| inboxes_controller.rb | ||
| likes_controller.rb | ||
| outboxes_controller.rb | ||
| replies_controller.rb | ||
| shares_controller.rb | ||