This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
_attachment_list.html.haml	…
_detailed_status.html.haml	…
_og_description.html.haml	…
_og_image.html.haml	…
_poll.html.haml	…
_simple_status.html.haml	…
_status.html.haml	…
embed.html.haml	…
show.html.haml	…