diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /public/emoji/1f498.svg | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'public/emoji/1f498.svg')
| -rw-r--r-- | public/emoji/1f498.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f498.svg b/public/emoji/1f498.svg index 8fdd3155a..32d819fe4 100644 --- a/public/emoji/1f498.svg +++ b/public/emoji/1f498.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#4289C1" d="M16.13 17.444L2.129 3.445c-.391-.39 1.023-1.804 1.414-1.415l14.001 14c.391.391-1.219 1.61-1.414 1.414z"/><path fill="#E75A70" d="M34.197 14.488c0-4.841-3.924-8.764-8.764-8.764-2.938 0-5.53 1.45-7.121 3.667-1.59-2.217-4.184-3.667-7.121-3.667-4.84 0-8.764 3.923-8.764 8.764 0 .686.087 1.351.236 1.99 1.217 7.562 9.624 15.538 15.649 17.729 6.024-2.19 14.432-10.167 15.647-17.728.151-.64.238-1.305.238-1.991z"/><path fill="#5DADEC" d="M34.648 25.764s-4.509-4.45-6.41-4.45l-5.657-.009-1.195 1.195.009 5.657c0 1.901 4.45 6.41 4.45 6.41.858.787 1.925 1.204 2.695 1.204.634 0 1.14-.276 1.505-.775.31-.427.426-.992.426-1.682 0-1.254-.556-2.864-1.39-4.313 1.449.833 3.059 1.39 4.313 1.39.689 0 1.255-.116 1.682-.426.499-.365.775-.871.775-1.505.001-.771-.416-1.837-1.203-2.696z"/><path fill="#2A6797" d="M31.569 32.542c-.256 0-.487-.122-.683-.317L17.497 18.827c-.391-.391 1.023-1.805 1.414-1.415l13.39 13.399c.391.391.378 1.036-.013 1.427-.194.194-.462.304-.719.304zM.161 1.123c0-.259.101-.511.286-.701.248-.252.611-.355.955-.27l6.541 1.625c.452.113.73.521.759.989-.009.465-.337.864-.793.961-.144.031-3.636.833-4.005 4.051-.055.477-.44.848-.92.883-.478.036-.915-.274-1.039-.738L.195 1.381C.172 1.296.161 1.21.161 1.123z"/><path fill="#DA2F47" d="M22.184 16.015c-.031.487-.415.89-.916.931-3.268.269-3.75 2.12-4.217 3.91l-.108.411c-.147.533-.697.846-1.229.7-.532-.147-.843-.694-.7-1.229l.103-.386c.489-1.875 1.306-5.013 5.988-5.399.551-.045 1.034.364 1.079.914.003.051.003.1 0 .148z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M16.13 17.444L2.129 3.445c-.391-.39 1.023-1.804 1.414-1.415l14.001 14c.391.391-1.219 1.61-1.414 1.414z"/><path fill="#DD2E44" d="M34.197 14.488c0-4.841-3.924-8.764-8.764-8.764-2.938 0-5.53 1.45-7.121 3.667-1.59-2.217-4.184-3.667-7.121-3.667-4.84 0-8.764 3.923-8.764 8.764 0 .686.087 1.351.236 1.99 1.217 7.562 9.624 15.538 15.649 17.729 6.024-2.19 14.432-10.167 15.647-17.728.151-.64.238-1.305.238-1.991z"/><path fill="#FFCC4D" d="M34.648 25.764s-4.509-4.45-6.41-4.45l-5.657-.009-1.195 1.195.009 5.657c0 1.901 4.45 6.41 4.45 6.41.858.787 1.925 1.204 2.695 1.204.634 0 1.14-.276 1.505-.775.31-.427.426-.992.426-1.682 0-1.254-.556-2.864-1.39-4.313 1.449.833 3.059 1.39 4.313 1.39.689 0 1.255-.116 1.682-.426.499-.365.775-.871.775-1.505.001-.771-.416-1.837-1.203-2.696z"/><path fill="#FFAC33" d="M31.569 32.542c-.256 0-.487-.122-.683-.317L17.497 18.827c-.391-.391 1.023-1.805 1.414-1.415l13.39 13.399c.391.391.378 1.036-.013 1.427-.194.194-.462.304-.719.304z"/><path fill="#FFCC4D" d="M.161 1.123c0-.259.101-.511.286-.701.248-.252.611-.355.955-.27l6.541 1.625c.452.113.73.521.759.989-.009.465-.337.864-.793.961-.144.031-3.636.833-4.005 4.051-.055.477-.44.848-.92.883-.478.036-.915-.274-1.039-.738L.195 1.381C.172 1.296.161 1.21.161 1.123z"/><path fill="#A0041E" d="M22.184 16.015c-.031.487-.415.89-.916.931-3.268.269-3.75 2.12-4.217 3.91l-.108.411c-.147.533-.697.846-1.229.7-.532-.147-.843-.694-.7-1.229l.103-.386c.489-1.875 1.306-5.013 5.988-5.399.551-.045 1.034.364 1.079.914.003.051.003.1 0 .148z"/></svg> \ No newline at end of file |
