mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
443ec4f8ba
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml` |
||
---|---|---|
.. | ||
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 |