diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-09 10:39:20 +0200 |
| commit | 12c8ac9e1443d352eca3538ed1558de8ccdd9434 (patch) | |
| tree | ed480d77b29f0d571ad219190288bde3b0c09b32 /public/emoji/1f4a3_border.svg | |
| parent | f328f2faa3fbdb182921366c6a20e745c069b840 (diff) | |
| parent | 89f40b6c3ec525b09d02f21e9b45276084167d8d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.
Diffstat (limited to 'public/emoji/1f4a3_border.svg')
| -rw-r--r-- | public/emoji/1f4a3_border.svg | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/public/emoji/1f4a3_border.svg b/public/emoji/1f4a3_border.svg new file mode 100644 index 000000000..aac8f4443 --- /dev/null +++ b/public/emoji/1f4a3_border.svg @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40"> + <g> + <path d="M24.187 9.657l5.658-5.654L32 6.16l-5.658 5.655z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="14" cy="22" r="14" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <path d="M19 11.342l5.658-5.657 5.657 5.658L24.657 17z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="32" cy="4" r="4" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <circle cx="32" cy="4" r="2" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + </g> + <path fill="#CCD6DD" d="M24.187 9.657l5.658-5.654L32 6.16l-5.658 5.655z"/> + <circle fill="#31373D" cx="14" cy="22" r="14"/> + <path fill="#31373D" d="M19 11.342l5.658-5.657 5.657 5.658L24.657 17z"/> + <circle fill="#F18F26" cx="32" cy="4" r="4"/> + <circle fill="#FDCB58" cx="32" cy="4" r="2"/> +</svg> |