diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-05-01 16:52:27 +0200 |
| commit | 392ca0472a50ea930f46e22dccf5ce55b04ef588 (patch) | |
| tree | 9f8c6b3dcb11a620a417205f9554e8d37e5f3e12 /public/emoji/26aa_border.svg | |
| parent | 252deefe3433d0cedafd973becd0d85b5182eb49 (diff) | |
| parent | 33f3818d660c67194f94c7ff2bb180f4865e6748 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.
Diffstat (limited to 'public/emoji/26aa_border.svg')
| -rw-r--r-- | public/emoji/26aa_border.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26aa_border.svg b/public/emoji/26aa_border.svg index d2cac5cad..38126cc6a 100644 --- a/public/emoji/26aa_border.svg +++ b/public/emoji/26aa_border.svg @@ -1,7 +1,7 @@ <?xml version="1.0"?> <svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40"> <g> - <circle cx="18" cy="18" r="18" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="18" cy="18" r="18" stroke="black" stroke-linejoin="round" stroke-width="4px"/> </g> <circle fill="#E6E7E8" cx="18" cy="18" r="18"/> </svg> |
