mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 18:41:37 +01:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
bookmarks_controller.rb | ||
favourited_by_accounts_controller.rb | ||
favourites_controller.rb | ||
mutes_controller.rb | ||
pins_controller.rb | ||
reblogged_by_accounts_controller.rb | ||
reblogs_controller.rb |