mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-15 15:44:56 +01:00
4e3c68e025
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream fixed an issue that glitch-soc did not have, in a place with glitch-soc changes to hide the number of followers. Kept glitch-soc's code. |
||
---|---|---|
.. | ||
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 |