mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 22:57:11 +00: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. |
||
---|---|---|
.. | ||
accept.rb | ||
add.rb | ||
announce.rb | ||
block.rb | ||
create.rb | ||
delete.rb | ||
flag.rb | ||
follow.rb | ||
like.rb | ||
move.rb | ||
reject.rb | ||
remove.rb | ||
undo.rb | ||
update.rb |