diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-08 16:17:19 +0200 |
| commit | 3160e050a95afe47317e82956f055a5ab6030698 (patch) | |
| tree | 957699d2b99e6d0024560d790a011a30e60ddd3b /public/emoji/1f470-1f3ff-200d-2640-fe0f.svg | |
| parent | 0c2eb949fc21ceecbd99a81e5ffe75517a1e64df (diff) | |
| parent | c4568e3b606cc4007739f881c334bdfe8dc77745 (diff) | |
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.
Diffstat (limited to 'public/emoji/1f470-1f3ff-200d-2640-fe0f.svg')
0 files changed, 0 insertions, 0 deletions