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/1f992.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/1f992.svg')
-rw-r--r-- | public/emoji/1f992.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f992.svg b/public/emoji/1f992.svg index 5e43bb4a8..594e4e5ba 100644 --- a/public/emoji/1f992.svg +++ b/public/emoji/1f992.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(36,0)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,14.167 -6.667,10.166 c -3.617,2.865 -8.01,7.426 -14.011,5.422 0,0 -2.958,0.135 -4.142,-1.215 -2.696,-1.962 -4.88,-8.812 -6.18,-11.207 -2.223,-4.089 -4.721,-7.022 -4.015,-9.104 0.932,-2.752 1.883,-4.696 4.792,-2.574 1.582,1.156 1.874,3.798 5.157,5.703 3.012,0.053 7.065,0.475 8.478,3.896 0,0 2.643,-3.387 5.254,-10.587 C -11.139,4.128 -10.309,1.546 -9.943,0 L 0,0 Z"/></g><g transform="translate(11.7715,28.0845)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.192,3.23 -0.988,4.512 -1.783,5.794 -1.637,6.393 -0.584,6.895 0.471,7.397 1.346,7.136 0.818,5.568 0.377,4.257 0.889,2.176 1.841,1.317 L 0,0 Z"/></g><g transform="translate(14.2959,33.1025)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.46,-0.952 3.304,-1.476 4.169,-4.971 5.035,-8.467 1.585,-7.404 0.576,-5.676 -0.546,-3.752 -0.931,-2.244 -0.962,-0.994 -0.979,-0.333 -0.931,1.924 0,0"/></g><g transform="translate(36,17.6665)" id="g32"><path id="path34" style="fill:#754c29;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -8.334,13.333 -18.333,15.833 -22.668,11.675 -14.751,13.211 -9.334,9.667 0,-3.499 L 0,0 Z"/></g><g transform="translate(16.4277,29.6943)" id="g36"><path id="path38" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.374,-0.192 -6.062,-4.647 -7.825,-6.604 0,0 -1.983,6.026 1.064,6.41 5.09,0.642 5.656,0.255 5.656,0.255 L 0,0 Z"/></g><g transform="translate(20.7451,33.7114)" id="g40"><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.419,-0.971 1.047,-3.463 -1.029,-6.405 -2.077,-2.943 -3.532,0.361 -2.885,2.255 0.72,2.108 1.608,3.385 2.533,4.227 C -0.893,0.523 0.846,1.963 0,0"/></g><g transform="translate(19.7637,32.6006)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.005,-0.605 -0.06,-1.32 -0.215,-2 -0.156,-0.678 -0.413,-1.323 -0.821,-1.786 -0.815,-0.926 -1.222,0.168 -0.705,1.283 0.518,1.115 1.326,1.969 1.404,2.452 C -0.259,0.431 0,0 0,0"/></g><g transform="translate(13.0557,22.1504)" id="g48"><path id="path50" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.776 -0.629,-1.405 -1.407,-1.405 -0.776,0 -1.405,0.629 -1.405,1.405 0,0.778 0.629,1.407 1.405,1.407 C -0.629,1.407 0,0.778 0,0"/></g><g transform="translate(3.6943,9.7783)" id="g52"><path id="path54" style="fill:#603913;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.727 -0.438,-1.315 -0.979,-1.315 -0.539,0 -0.977,0.588 -0.977,1.315 0,0.726 0.438,1.315 0.977,1.315 C -0.438,1.315 0,0.726 0,0"/></g><g transform="translate(25.4453,26.3149)" id="g56"><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.611,-1.314 -2.945,-3.481 0.666,-2.167 2.166,-5.834 3.333,-5.834 1.167,0 4.529,4.482 4.529,4.482 0,0 -2.445,2.922 -4.917,4.833"/></g><g transform="translate(31.7256,19.8501)" id="g60"><path id="path62" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -3.226,-1.35 -3.226,-3.184 0,-1.833 -1.168,-4.833 0.166,-6.333 1.334,-1.5 4.334,-1.166 5.834,-0.166 1.5,1 1.5,1.666 1.5,1.666 l 0,2.334 c 0,0 -1.337,1.939 -1.944,2.669 C 1.47,-1.776 0,0 0,0"/></g><g transform="translate(25.666,15.333)" id="g64"><path id="path66" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.518,-0.414 1.667,-2.834 0.667,-4 -0.333,-5.166 -2.167,-6.499 -3,-3.666 -3.833,-0.833 -1.834,0.5 0,0"/></g><g transform="translate(31.166,7.333)" id="g68"><path id="path70" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.745,2.007 -4.499,-1.166 -4.666,-3.166 -0.167,-2 0.5,-2.834 2.5,-3.167 C -0.166,-6.666 4.666,-2.5 0,0"/></g><g transform="translate(36,8.667)" id="g72"><path id="path74" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -2.666,0.499 -2.5,-0.834 -2.334,-2.167 0,-5.667 0,-5.667 L 0,0 Z"/></g><g transform="translate(2.2603,12.6807)" id="g76"><path id="path78" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3.379,5.312 4.601,9.001 1.221,3.69 3.639,5.318 3.639,5.318 0,0 -1.5,-5.334 -2.834,-8.333 C 4.073,2.986 1.094,-1.319 0,0"/></g><g transform="translate(17.833,19.5)" id="g80"><path id="path82" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.499,-0.167 3.001,-2.833 0.833,-3.333 -2.167,-0.501 -4,0.666 -3.667,2 C -2.5,0 0,0 0,0"/></g><g transform="translate(15.666,13.666)" id="g84"><path id="path86" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.447,-1.298 -2.999,-1.001 -3.333,-0.167 -3.667,0.667 -4.166,3.5 -2.333,3 -0.5,2.5 0.982,0.88 0,0"/></g><g transform="translate(11.2573,12.8301)" id="g88"><path id="path90" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.021,-0.805 -2.118,-0.62 -2.353,-0.104 -2.588,0.413 -2.941,2.169 -1.647,1.859 -0.352,1.55 0.693,0.545 0,0"/></g><g transform="translate(18.8926,22.1812)" id="g92"><path id="path94" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.168,-1.29 -1.082,-1.925 -1.611,-1.719 -2.14,-1.514 -3.62,-0.505 -2.478,0.177 -1.336,0.861 0.115,0.874 0,0"/></g><g transform="translate(14.5688,28.8994)" id="g96"><path id="path98" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.215,2.999 1.048,4.499 -0.167,1.5 0.418,2.187 1.477,2.187 1.168,0 1.471,-0.791 0.607,-2.01 C 2.171,3.682 1.738,1.583 2.229,0.397 L 0,0 Z"/></g><g transform="translate(17.0942,35.585)" id="g100"><path id="path102" style="fill:#8b5e3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.239,-0.002 1.072,-1.358 0.607,-2.01 -0.465,-0.651 -2.085,-0.177 -2.085,-0.177 0,0 -0.446,2.188 1.478,2.187"/></g><g transform="translate(10.579,32.9503)" id="g104"><path id="path106" style="fill:#8b5e3c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -1.288,1.878 0.598,2.256 2.794,2.696 2.991,1.43 2.039,0.615 1.087,-0.201 0,0 0,0"/></g><g transform="translate(36,0)" id="g108"><path id="path110" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,2 C 0,2 -1.334,2 -3,1.333 -3.788,1.018 -4.346,0.48 -4.722,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 36V21.833l-6.667-10.167c-3.617-2.864-8.01-7.425-14.011-5.421 0 0-2.958-.135-4.143 1.215C8.484 9.422 6.3 16.272 5 18.667 2.778 22.756.28 25.689.986 27.772c.932 2.752 1.883 4.695 4.792 2.573 1.582-1.155 1.874-3.798 5.156-5.703 3.013-.053 7.066-.475 8.478-3.896 0 0 2.643 3.387 5.254 10.587.195.539 1.025 3.121 1.391 4.667H36z"/><path fill="#FFCC4D" d="M11.771 7.916s-.192-3.23-.988-4.512c-.795-1.283-.649-1.882.404-2.383 1.055-.502 1.93-.241 1.402 1.327-.441 1.311.071 3.392 1.023 4.251l-1.841 1.317zm2.525-5.019c.46.952 3.304 1.476 4.169 4.971.866 3.496-2.584 2.434-3.593.705-1.122-1.924-1.507-3.432-1.538-4.682-.018-.661.031-2.917.962-.994z"/><path fill="#754C29" d="M36 18.333C27.666 5 17.667 2.5 13.332 6.658 21.249 5.122 26.666 8.667 36 21.833v-3.5z"/><path fill="#F4900C" d="M16.428 6.306c-2.374.192-6.061 4.647-7.825 6.604 0 0-1.983-6.025 1.064-6.409 5.09-.643 5.656-.255 5.656-.255l1.105.06z"/><path fill="#FFCC4D" d="M20.745 2.289c-.419.971 1.047 3.463-1.029 6.405-2.077 2.943-3.531-.361-2.885-2.255.72-2.107 1.608-3.385 2.533-4.227.489-.446 2.227-1.886 1.381.077z"/><path fill="#F4900C" d="M19.764 3.399c-.005.605-.06 1.32-.215 2-.156.679-.413 1.324-.821 1.786-.815.927-1.222-.167-.705-1.283.518-1.115 1.326-1.969 1.404-2.452.078-.482.337-.051.337-.051z"/><path fill="#292F33" d="M13.056 13.85c0 .776-.629 1.405-1.407 1.405-.776 0-1.405-.629-1.405-1.405 0-.778.629-1.407 1.405-1.407.778 0 1.407.629 1.407 1.407z"/><path fill="#603913" d="M3.694 26.222c0 .726-.438 1.315-.979 1.315-.539 0-.978-.589-.978-1.315s.438-1.315.978-1.315c.541-.001.979.589.979 1.315z"/><path fill="#F4900C" d="M25.445 9.685s-3.611 1.314-2.945 3.481S24.666 19 25.833 19s4.529-4.482 4.529-4.482-2.444-2.922-4.917-4.833zm6.281 6.465S28.5 17.5 28.5 19.334s-1.168 4.833.166 6.333 4.334 1.166 5.834.166 1.5-1.666 1.5-1.666v-2.334s-1.337-1.939-1.945-2.669c-.859-1.239-2.329-3.014-2.329-3.014zm-6.06 4.517c1.518.414 1.667 2.834.667 4s-2.834 2.499-3.667-.334 1.166-4.166 3-3.666zm5.5 8c-3.745-2.007-4.499 1.166-4.666 3.166S27 34.667 29 35s6.832-3.833 2.166-6.333zM36 27.333s-2.666-.499-2.5.834S36 33 36 33v-5.667zM2.26 23.319s3.379-5.312 4.601-9.001C8.082 10.628 10.5 9 10.5 9S9 14.334 7.667 17.333c-1.334 3-4.313 7.306-5.407 5.986zM17.833 16.5c1.499.167 3.001 2.833.833 3.333-2.167.5-4-.667-3.667-2s2.834-1.333 2.834-1.333zm-2.167 5.834c-1.447 1.298-3 1.001-3.333.167s-.833-3.667 1-3.167 3.314 2.12 2.333 3zm-4.409.836c-1.022.805-2.118.62-2.353.103-.235-.517-.589-2.272.705-1.963 1.296.31 2.342 1.315 1.648 1.86zm7.636-9.351c-.168 1.29-1.082 1.925-1.611 1.719-.529-.206-2.009-1.214-.868-1.897 1.142-.683 2.594-.696 2.479.178z"/><path fill="#FFCC4D" d="M14.569 7.101s1.215-2.999 1.048-4.499.419-2.187 1.477-2.187c1.167 0 1.471.791.607 2.01-.962.994-1.394 3.093-.904 4.278l-2.228.398z"/><path fill="#8B5E3C" d="M17.094.415c2.239.002 1.072 1.358.607 2.01-.465.651-2.085.177-2.085.177S15.17.414 17.094.415zM10.579 3.05s-1.288-1.878.598-2.256c2.196-.44 2.393.826 1.441 1.641-.951.815-2.039.615-2.039.615z"/><path fill="#F4900C" d="M36 36v-2s-1.334 0-3 .667c-.788.315-1.346.853-1.722 1.333H36z"/></svg> \ No newline at end of file |