mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-02 22:09:04 +01:00
82eebd0482
Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block. |
||
---|---|---|
.. | ||
direct_controller.rb | ||
home_controller.rb | ||
list_controller.rb | ||
public_controller.rb | ||
tag_controller.rb |