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/1f6a3-1f3fb-200d-2642-fe0f.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/1f6a3-1f3fb-200d-2642-fe0f.svg')
| -rw-r--r-- | public/emoji/1f6a3-1f3fb-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6a3-1f3fb-200d-2642-fe0f.svg b/public/emoji/1f6a3-1f3fb-200d-2642-fe0f.svg index 85a692145..a9651dca4 100644 --- a/public/emoji/1f6a3-1f3fb-200d-2642-fe0f.svg +++ b/public/emoji/1f6a3-1f3fb-200d-2642-fe0f.svg @@ -1 +1 @@ -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M18.988 13.816l1.245-1.41c.942.928 2.453 1.492 2.959 1.166.556-.353 1.916.904.806 1.613-1.11.71-1.417-.007-2.31-.264-1.032-.296-1.61-.546-2.7-1.105zm.979-6.691c.91.201-.046.961.236 2.329.312 1.516-2.047 0-1.826 2.171.149 1.464-1.865 1.973-2.019.507-.154-1.464 1.045-2.254.385-3.394-1.578-2.731 3.224-1.613 3.224-1.613z"/><path d="M15.356 15.875l3.083 1.158-1.156 3.084s-4.55-1.004-5.259-2.113c-.709-1.111.602-2.729.602-2.729l2.73.6z"/><path fill="#292F33" d="M19.967 7.55c.808.668.57-.862 0-1.335-.806-.667-2.418-.668-3.224 0-.806.667-.806 2.003 0 2.67.57.472.806 1.335.806 0s.807 0 .807-.667c-.001-.668 1.611-.668 1.611-.668z"/><path fill="#C1694F" d="M2 17h32s0 2-1 7c-.86 4.302-21 1-24.601 0C5.316 23.144 2 17 2 17z"/><path fill="#F4900C" d="M35 18c0 .553-.447 1-1 1H2c-.552 0-1-.447-1-1 0-.553.448-1 1-1h32c.553 0 1 .447 1 1z"/><path fill="#55ACEE" d="M0 24h36v12H0z"/><path fill="#FFAC33" d="M12 27c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l11-11c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-11.001 11c-.195.195-.451.293-.706.293z"/><path fill="#FFCC4D" d="M11 29c-.512 0-1.024-.195-1.414-.586-.781-.781-.781-2.047 0-2.828l3-3c.78-.781 2.048-.781 2.828 0 .781.781.781 2.047 0 2.828l-3 3c-.391.391-.903.586-1.414.586z"/><path fill="#77B255" d="M20.233 12.407s-.563-.683-.678-.856c-.482-.732-.833-1.126-1.568-1.288-1.287-.284-2.912.308-4.222 1.927-.829 1.024-.947 2.174-2.259 3.794 0 0 4.199.447 4.754.092.556-.354.758-1.265.959-2.174.2-.91.671-1.255 1.04-.71.24.354.728.624.728.624l1.246-1.409z"/></svg> \ No newline at end of file +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M15.356 15.875l3.083 1.158-1.156 3.084s-4.55-1.004-5.259-2.113c-.709-1.111.602-2.729.602-2.729l2.73.6z"/><path fill="#C1694F" d="M2 17h32s0 2-1 7c-.86 4.302-21 1-24.601 0C5.316 23.144 2 17 2 17z"/><path fill="#F4900C" d="M35 18c0 .553-.447 1-1 1H2c-.552 0-1-.447-1-1 0-.553.448-1 1-1h32c.553 0 1 .447 1 1z"/><path fill="#55ACEE" d="M0 23.933V34c0 1.105.895 2 2 2h32c1.105 0 2-.895 2-2v-9.637c0-.637-.585-1.097-1.21-.976-11.333 2.19-22.667-2.809-34-.439-.461.096-.79.514-.79.985z"/><path fill="#1C6399" d="M24.646 13.533c-.171-.171-.448-.171-.619 0l-8.031 8.031c-2.225 2.224-2.691.599-5.033 2.941l-3.231 3.231c-.2.199-.199.523 0 .723l.994.994.994.994c.2.2.523.2.722 0l3.231-3.231c2.342-2.342.717-2.809 2.941-5.033l8.031-8.031c.172-.171.172-.448.001-.619z"/><path fill="#F7DECE" d="M17.028 9.229c-.176-.21-.314-.46-.388-.773-.265-1.118.345-2.22 1.362-2.461 1.017-.241 2.447.464 2.46 1.613.013 1.141-.556 2.847-1.522 2.6-.255-.065-.51-.138-.754-.228-.098.125-.153.592-.096.987.147 1.008-1.245 1.167-1.391.157-.116-.798.365-1.327.329-1.895z"/><path fill="#292F33" d="M19.947 6.183c-1.426-.8-2.352-.616-3.1.042-.743.653-.726 1.824-.477 2.559.249.735.464.684.464.684s1.04.186 1.072-.772c.01-.303-.333-.45.011-.91.222-.296.752-.178.773.233.022.411.228.324.228.324l.567-1.117s.531-.055.85.42c.202.298.857-.764-.388-1.463z"/><path fill="#F7DECE" d="M24.229 14.008l-.118-.118c-.271-.28-.494-.141-.642-.049-.064.04-.126.078-.172.078h-.004c-.178-.025-2.298-.865-2.562-1.116-.072-.069-.182-.192-.321-.348-.399-.449-1.004-1.126-1.621-1.538-.484-.323-.858-.319-1.086-.26-.277.071-.515.266-.655.534-.315.605-.131 1.283.447 1.647 1.135.716 2.013 1.25 2.539 1.542.41.227 1.505.465 2.229.624.248.054.482.105.526.123.079.032.188.141.292.247.163.165.331.333.502.333.017 0 .033-.001.051-.005.267-.055.513-.419.783-.854.252-.403.067-.586-.188-.84z"/><path fill="#77B255" d="M19.556 11.55c-.482-.732-.833-1.126-1.568-1.288-1.287-.284-2.912.308-4.222 1.927-.829 1.024-.947 2.174-2.259 3.794 0 0 4.199.447 4.754.092.556-.354.758-1.265.959-2.174.106-.482.288-.806.491-.922.426.358 1.277.837 1.277.837l1.306-1.507c0 .001-.525-.587-.738-.759z"/></svg> \ No newline at end of file |
