diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg')
| -rw-r--r-- | public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg b/public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg index 0d46f8906..9cec4cdc3 100644 --- a/public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg +++ b/public/emoji/1f93e-1f3fe-200d-2640-fe0f.svg @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 45" style="enable-background:new 0 0 45 45;" xml:space="preserve" version="1.1" id="svg2"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"><clipPath id="clipPath16" clipPathUnits="userSpaceOnUse"><path id="path18" d="M 0,36 36,36 36,0 0,0 0,36 Z"/></clipPath></defs><g transform="matrix(1.25,0,0,-1.25,0,45)" id="g10"><g id="g12"><g clip-path="url(#clipPath16)" id="g14"><g transform="translate(16,31)" id="g20"><path id="path22" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-1.657 1.176,-3 2.625,-3 4.075,-3 5.25,-1.657 5.25,0 5.25,1.657 4.075,3 2.625,3 1.176,3 0,1.657 0,0"/></g><g transform="translate(15.6298,32.7878)" id="g24"><path id="path26" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.193,1.038 -1.258,1.158 -1.196,0.1 -1.513,-1.208 -2.378,-1.675 -0.653,-0.352 -1.4,-0.364 -1.921,-0.013 0,0 0.716,-0.867 1.52,-1.197 1.045,-0.43 2.333,-0.154 2.947,0.175 C -0.13,-1.038 0,0 0,0"/></g><g transform="translate(17.9671,2.645)" id="g28"><path id="path30" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.552,0 -1,0.447 -1,1 l 0,3 C -1,4.553 -0.552,5 0,5 0.552,5 1,4.553 1,4 L 1,1 C 1,0.447 0.552,0 0,0"/></g><g transform="translate(8.5357,1.5688)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.199,-0.094 -0.43,-0.123 -0.661,-0.067 -0.537,0.131 -0.866,0.671 -0.736,1.208 l 0.67,2.76 C -0.597,4.436 -0.058,4.767 0.48,4.636 1.017,4.506 1.346,3.965 1.216,3.429 L 0.546,0.669 C 0.472,0.363 0.265,0.125 0,0"/></g><g transform="translate(19.7297,26.8932)" id="g36"><path id="path38" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.457,3.933 C -0.517,4.483 -1.031,4.906 -1.574,4.842 -2.122,4.781 -2.524,4.299 -2.463,3.75 l 0.4,-3.643 -4.584,0 L -12.502,3 c -0.55,0.091 -1.06,-0.277 -1.151,-0.821 -0.091,-0.545 0.278,-1.06 0.822,-1.151 l 5.389,-2.788 c 0.055,-0.009 0.657,-0.133 0.712,-0.133 l 2.749,0 c 0.009,-0.262 0.086,-0.588 0.251,-1 1,-2.5 3,-8 3,-8 2.209,0 2.625,4.723 2.625,7.208 0,0.604 0.299,0.754 0.197,1.101 1.171,0.151 1.334,-0.36 1.874,-0.488 0,0 -1.799,3.261 -3.966,3.072"/></g><g transform="translate(14.1767,9.8777)" id="g40"><path id="path42" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.456,0.402 -0.56,1.088 -0.216,1.612 L 4.6,8.959 C 4.976,9.533 5.747,9.694 6.32,9.318 6.891,8.936 7.055,8.171 6.678,7.598 L 1.862,0.25 C 1.485,-0.324 0.715,-0.484 0.141,-0.108 0.091,-0.075 0.044,-0.039 0,0"/></g><g transform="translate(8.6281,4.9205)" id="g44"><path id="path46" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.308,0.458 -0.268,1.066 0.116,1.42 L 5.498,6.391 C 5.919,6.78 6.593,6.716 7.003,6.249 7.411,5.779 7.407,5.089 6.986,4.701 L 1.603,-0.27 C 1.183,-0.659 0.509,-0.595 0.098,-0.128 0.062,-0.087 0.03,-0.044 0,0"/></g><g transform="translate(17.4887,6.6699)" id="g48"><path id="path50" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.184,0.479 -0.029,1.019 0.384,1.257 L 6.17,4.605 C 6.623,4.867 7.212,4.666 7.486,4.158 7.756,3.647 7.617,3.025 7.164,2.764 L 1.378,-0.584 C 0.926,-0.845 0.337,-0.645 0.062,-0.137 0.038,-0.092 0.018,-0.047 0,0"/></g><g transform="translate(24.304,9.3631)" id="g52"><path id="path54" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.533,-0.186 -1.136,0.044 -1.403,0.561 l -3.745,7.25 c -0.292,0.566 -0.07,1.263 0.496,1.555 0.569,0.288 1.262,0.071 1.554,-0.496 L 0.647,1.62 C 0.94,1.054 0.718,0.357 0.152,0.065 0.102,0.039 0.052,0.018 0,0"/></g><g transform="translate(24.3041,22.9738)" id="g56"><path id="path58" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.85,2.008 c -0.457,0.238 -0.635,0.807 -0.397,1.264 0.238,0.457 0.807,0.636 1.264,0.398 L 0.867,1.662 C 1.324,1.423 1.502,0.854 1.264,0.397 1.026,-0.059 0.457,-0.238 0,0"/></g><g transform="translate(30.07,22.1199)" id="g60"><path id="path62" style="fill:#af7e57;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.302,0.783 c -0.51,0.075 -0.866,0.554 -0.79,1.064 0.075,0.509 0.554,0.865 1.063,0.79 L 0.274,1.854 C 0.784,1.779 1.139,1.3 1.064,0.79 0.989,0.28 0.51,-0.075 0,0"/></g><g transform="translate(21.25,31)" id="g64"><path id="path66" style="fill:#60352a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.283,0.678 0.479,1.333 0.225,0.75 -0.542,1.855 -1.437,2.48 -0.699,0.486 -2.461,0.66 -3.656,0.028 -1.349,-0.713 -1.687,-2.024 -1.462,-3.373 0.207,-1.24 1.349,-2.324 1.349,-2.324 0,0 0.415,1.064 0.227,1.085 -0.347,0.039 -0.555,1.105 -0.264,1.389 0.306,0.299 0.599,0 0.674,-0.3 0.075,-0.3 0.277,-1.151 0.277,-1.151 0,0 -0.052,1.076 0.248,1.413 0.3,0.338 1.724,0.263 2.324,1.724 0,0 0.47,-0.179 0.845,-0.742 C -0.087,1.099 0,0 0,0"/></g><g transform="translate(16.5004,18.043)" id="g68"><path id="path70" style="fill:#a0041e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.803,-2.027 -1.071,-2.869 -0.268,-0.842 -0.825,-1.799 -0.825,-1.799 0,0 1.694,-1.477 2.995,-1.439 l 1.885,2.74 1.674,-2.359 c 0,0 1.708,1.23 2.883,1.433 0,0 -1.497,3.069 -1.841,3.719 C 5.356,0.077 4.514,0.918 4.514,0.918 L 0,0 Z"/></g><g transform="translate(15.5487,27.1949)" id="g72"><path id="path74" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.274,-0.075 1.799,-0.112 0,0 0.075,-0.825 1.349,-0.863 1.275,-0.037 1.612,0.638 1.612,0.638 0,0 0.975,-0.075 1.687,-0.525 0.712,-0.45 1.799,-0.975 1.799,-0.975 0,0 -1.012,-0.862 -0.637,-1.799 l -1.012,0.483 c 0,0 0.3,-0.671 0.188,-1.084 -0.113,-0.412 -0.48,-0.75 -0.521,-1.125 -0.116,-1.043 0.329,-3.891 0.479,-4.229 0,0 -1.292,0.334 -3.188,0.125 -1.16,-0.127 -3.125,-0.958 -3.125,-0.958 0.021,0.812 0.589,2.826 0.73,3.896 0.136,1.041 -0.785,3.942 -1.422,4.092 -0.638,0.15 -1.125,0.187 -1.125,0.187 0,0 0.15,0.675 0,1.2 -0.15,0.524 -0.225,0.899 -0.225,0.899 0,0 1.162,0.075 1.612,0.15"/></g><g transform="translate(7,28)" id="g76"><path id="path78" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.105 -0.895,2 -2,2 -1.105,0 -2,-0.895 -2,-2 0,-1.105 0.895,-2 2,-2 1.105,0 2,0.895 2,2"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse fill="#AF7E57" cx="18.625" cy="5" rx="2.625" ry="3"/><path fill="#60352A" d="M15.63 3.212s.193-1.038-1.258-1.158c-1.196-.099-1.513 1.208-2.378 1.675-.653.352-1.4.364-1.921.013 0 0 .716.867 1.52 1.198 1.045.43 2.333.154 2.947-.175.96-.515 1.09-1.553 1.09-1.553z"/><path fill="#DD2E44" d="M17.967 33.355c-.552 0-1-.447-1-1v-3c0-.553.448-1 1-1s1 .447 1 1v3c0 .553-.448 1-1 1zm-9.431 1.076c-.199.094-.43.123-.661.067-.537-.13-.866-.671-.736-1.208l.669-2.76c.13-.535.669-.866 1.207-.736.537.13.866.671.736 1.208l-.669 2.76c-.074.306-.281.544-.546.669z"/><path fill="#AF7E57" d="M19.73 9.107l-.457-3.933c-.061-.549-.574-.973-1.117-.908-.549.061-.951.543-.889 1.092l.4 3.642h-4.584L7.228 6.106c-.55-.091-1.06.278-1.151.822-.091.545.277 1.06.822 1.151l5.389 2.787c.054.01.657.134.712.134h2.749c.009.262.086.588.251 1 1 2.5 3 8 3 8 2.209 0 2.625-4.723 2.625-7.208 0-.604.299-.753.197-1.101 1.171-.152 1.334.359 1.874.487 0 0-1.799-3.26-3.966-3.071z"/><path fill="#AF7E57" d="M14.177 26.122c-.456-.402-.56-1.088-.216-1.612l4.817-7.347c.376-.574 1.147-.735 1.72-.359.571.382.734 1.147.358 1.72l-4.817 7.347c-.376.574-1.147.735-1.72.359-.052-.032-.098-.069-.142-.108z"/><path fill="#AF7E57" d="M8.628 31.08c-.308-.458-.268-1.066.116-1.42l5.382-4.971c.42-.389 1.094-.325 1.505.142.407.471.403 1.161-.018 1.549l-5.382 4.971c-.42.388-1.095.325-1.505-.142-.036-.042-.068-.085-.098-.129zm8.861-1.75c-.184-.479-.029-1.019.384-1.257l5.786-3.347c.452-.262 1.041-.062 1.315.447.271.511.131 1.133-.322 1.394l-5.786 3.347c-.452.261-1.041.061-1.315-.447-.024-.045-.044-.09-.062-.137z"/><path fill="#AF7E57" d="M24.304 26.637c-.533.185-1.136-.044-1.403-.561l-3.745-7.25c-.293-.566-.071-1.263.495-1.555.569-.288 1.263-.071 1.555.496l3.745 7.25c.293.566.071 1.263-.495 1.555-.05.026-.1.047-.152.065zm0-13.611l-3.85-2.008c-.457-.238-.636-.807-.398-1.264.238-.457.807-.636 1.264-.397l3.85 2.008c.457.238.636.807.398 1.264-.238.457-.807.636-1.264.397z"/><path fill="#AF7E57" d="M30.07 13.88l-5.302-.783c-.51-.075-.865-.554-.79-1.064.075-.51.554-.865 1.064-.79l5.302.783c.51.075.865.554.79 1.064-.075.51-.554.865-1.064.79z"/><path fill="#60352A" d="M21.25 5s.283-.678.479-1.333c.225-.75-.542-1.855-1.438-2.479-.699-.487-2.461-.66-3.656-.029-1.349.713-1.687 2.024-1.462 3.373.207 1.24 1.349 2.324 1.349 2.324s.414-1.064.227-1.085c-.347-.039-.555-1.105-.264-1.389.306-.299.6 0 .675.3.075.3.277 1.151.277 1.151s-.052-1.076.248-1.414c.3-.337 1.724-.262 2.324-1.724 0 0 .47.179.845.742.309.464.396 1.563.396 1.563z"/><path fill="#A0041E" d="M16.5 17.957s-.803 2.028-1.071 2.869c-.268.842-.825 1.799-.825 1.799s1.694 1.477 2.995 1.438l1.885-2.74 1.674 2.359s1.708-1.229 2.884-1.433c0 0-1.497-3.069-1.841-3.719-.344-.65-1.186-1.492-1.186-1.492l-4.515.919z"/><path fill="#DD2E44" d="M15.549 8.805s1.274.075 1.799.112c0 0 .075.825 1.349.862 1.274.037 1.612-.637 1.612-.637s.975.075 1.687.525c.712.45 1.799.975 1.799.975s-1.012.862-.637 1.799l-1.012-.483s.3.671.188 1.083c-.112.412-.479.75-.521 1.125-.116 1.044.329 3.892.479 4.229 0 0-1.292-.333-3.188-.125-1.16.128-3.125.958-3.125.958.021-.812.589-2.827.729-3.896.137-1.041-.785-3.942-1.422-4.092-.637-.15-1.125-.187-1.125-.187s.15-.675 0-1.199c-.15-.525-.225-.9-.225-.9s1.163-.074 1.613-.149z"/><circle fill="#269" cx="5" cy="8" r="2"/></svg> \ No newline at end of file |
