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. |
||
---|---|---|
.. | ||
_domain_blocks.html.haml | ||
_login.html.haml | ||
_registration.html.haml | ||
more.html.haml | ||
show.html.haml | ||
terms.html.haml |