mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-23 19:18:07 +01:00
cd1e3ac2c7
Conflicts: - `app/controllers/api/v1/timelines/public_controller.rb`: Upstream refactored this code, the conflict was because of an extra supported parameter, `allow_local_only`. Updated the controller to follow upstream's refactor, and moved the extra parameter definition accordingly. |
||
---|---|---|
.. | ||
base_controller.rb | ||
direct_controller.rb | ||
home_controller.rb | ||
list_controller.rb | ||
public_controller.rb | ||
tag_controller.rb |