diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:06:58 +0100 |
| commit | d8fdbb054e30f6e8e505bce63e5f150bf117cd8e (patch) | |
| tree | 0a671ee6c8a7644e6613dd87798f661f4703e8fe /public | |
| parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
| parent | 65db2625508c220fd3c0a1f37cdd2e13b6e02987 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.
Diffstat (limited to 'public')
| -rw-r--r-- | public/emoji/1f4f1_border.svg | 9 | ||||
| -rw-r--r-- | public/emoji/1f4f2_border.svg | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/public/emoji/1f4f1_border.svg b/public/emoji/1f4f1_border.svg new file mode 100644 index 000000000..fac246510 --- /dev/null +++ b/public/emoji/1f4f1_border.svg @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40"> + <g> + <path d="M11 36s-4 0-4-4V4s0-4 4-4h14s4 0 4 4v28s0 4-4 4H11z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <path d="M9 5h18v26H9z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + </g> + <path fill="#31373D" d="M11 36s-4 0-4-4V4s0-4 4-4h14s4 0 4 4v28s0 4-4 4H11z"/> + <path fill="#55ACEE" d="M9 5h18v26H9z"/> +</svg> diff --git a/public/emoji/1f4f2_border.svg b/public/emoji/1f4f2_border.svg new file mode 100644 index 000000000..30edddf5e --- /dev/null +++ b/public/emoji/1f4f2_border.svg @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 40 40"> + <g> + <path d="M18 36s-4 0-4-4V4s0-4 4-4h14s4 0 4 4v28s0 4-4 4H18z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + <path d="M16 5h18v26H16zm-3 11s1 1 1 2-1 2-1 2l-5 5c-1 1-3 1-3-1v-3H2s-2 0-2-2v-2c0-2 2-2 2-2h3v-3c0-2 2-2 3-1l5 5z" stroke="white" stroke-linejoin="round" stroke-width="4px"/> + </g> + <path fill="#31373D" d="M18 36s-4 0-4-4V4s0-4 4-4h14s4 0 4 4v28s0 4-4 4H18z"/> + <path fill="#55ACEE" d="M16 5h18v26H16zm-3 11s1 1 1 2-1 2-1 2l-5 5c-1 1-3 1-3-1v-3H2s-2 0-2-2v-2c0-2 2-2 2-2h3v-3c0-2 2-2 3-1l5 5z"/> +</svg> |
