mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 17:28:07 +01:00
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
_account.html.haml | ||
_action_log.html.haml | ||
_report.html.haml | ||
_status.html.haml | ||
index.html.haml | ||
show.html.haml |