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/1f356.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/1f356.svg')
| -rw-r--r-- | public/emoji/1f356.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f356.svg b/public/emoji/1f356.svg index bb4e72396..44fab599d 100644 --- a/public/emoji/1f356.svg +++ b/public/emoji/1f356.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(14.0171,25.6323)" id="g20"><path id="path22" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.844,5.844 c 0.846,1.017 0.804,2.525 -0.15,3.479 -1.011,1.011 -2.65,1.011 -3.662,0 -0.621,-0.621 -0.856,-1.479 -0.715,-2.282 -0.804,0.141 -1.661,-0.095 -2.282,-0.716 -1.011,-1.011 -1.011,-2.651 0,-3.662 0.954,-0.954 2.462,-0.995 3.479,-0.149 L -3.33,-3.33 0,0 Z"/></g><g transform="translate(25.9355,13.7129)" id="g24"><path id="path26" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.845,-5.844 c 1.016,0.846 2.524,0.805 3.478,-0.15 1.012,-1.011 1.012,-2.651 0,-3.661 -0.621,-0.621 -1.478,-0.857 -2.282,-0.716 0.142,-0.804 -0.095,-1.661 -0.716,-2.281 -1.011,-1.012 -2.65,-1.012 -3.661,0 -0.955,0.954 -0.996,2.462 -0.149,3.478 L -3.33,-3.33 0,0 Z"/></g><g transform="translate(30.0205,20.1211)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.632,1.633 -4.113,1.544 -6.234,3.665 -2.121,2.121 -2.033,4.602 -3.665,6.235 -3.515,3.515 -7.018,1.467 -11.314,-2.829 -4.296,-4.296 -6.343,-7.798 -2.829,-11.313 1.633,-1.633 4.114,-1.544 6.235,-3.665 2.122,-2.121 2.033,-4.603 3.665,-6.235 3.515,-3.514 7.018,-1.467 11.314,2.829 C 1.468,-7.018 3.515,-3.515 0,0"/></g><g transform="translate(14,13)" id="g32"><path id="path34" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.104,0 -0.211,0.017 -0.316,0.052 -0.84,0.226 -1.124,0.792 -0.949,1.316 0.161,4.644 4.356,8.839 7.684,9.949 8.212,10.124 8.773,9.84 8.948,9.316 9.123,8.792 8.84,8.226 8.316,8.051 5.631,7.156 1.844,3.369 0.949,0.684 0.809,0.265 0.419,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFD983" d="M14.017 10.368L8.173 4.524c.847-1.017.805-2.525-.15-3.479-1.011-1.011-2.65-1.011-3.662 0-.621.621-.856 1.478-.715 2.282-.804-.141-1.661.094-2.282.715-1.011 1.011-1.011 2.651 0 3.662.954.955 2.462.996 3.479.15l5.844 5.844 3.33-3.33zm11.918 11.919l5.845 5.844c1.017-.846 2.524-.805 3.479.15 1.012 1.011 1.012 2.65 0 3.661-.621.621-1.479.856-2.282.716.142.804-.095 1.661-.716 2.281-1.011 1.012-2.65 1.012-3.661 0-.955-.954-.996-2.462-.149-3.479l-5.845-5.844 3.329-3.329z"/><path fill="#C1694F" d="M30.021 15.879c-1.632-1.633-4.113-1.543-6.234-3.665-2.121-2.121-2.032-4.602-3.665-6.235-3.515-3.515-7.018-1.467-11.313 2.829-4.296 4.296-6.343 7.799-2.829 11.313 1.633 1.633 4.114 1.544 6.235 3.665 2.122 2.121 2.032 4.603 3.665 6.234 3.515 3.515 7.018 1.468 11.314-2.828s6.341-7.798 2.827-11.313z"/><path fill="#662113" d="M14 23c-.104 0-.211-.017-.316-.052-.524-.174-.807-.74-.632-1.265 1.109-3.328 5.305-7.523 8.632-8.632.528-.176 1.09.108 1.265.632.175.524-.108 1.09-.632 1.265-2.686.895-6.473 4.682-7.368 7.368-.14.419-.53.684-.949.684z"/></svg> \ No newline at end of file |
