mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-28 00:11:37 +01:00
3160e050a9
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. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper.rb | ||
application_helper.rb | ||
domain_control_helper.rb | ||
email_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
mascot_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
statuses_helper.rb | ||
webfinger_helper.rb |