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/1f596-1f3fc.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/1f596-1f3fc.svg')
-rw-r--r-- | public/emoji/1f596-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f596-1f3fc.svg b/public/emoji/1f596-1f3fc.svg index da2236382..9f1d4f107 100644 --- a/public/emoji/1f596-1f3fc.svg +++ b/public/emoji/1f596-1f3fc.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.8487,18.4514)" id="g20"><path id="path22" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.274,-1.01 -0.334,-2.049 -1.36,-2.322 l -0.247,-0.065 c -1.026,-0.27 -2.079,0.33 -2.353,1.341 l -3.714,13.659 c -0.471,1.642 -0.147,3.184 1.279,3.601 l 0.449,0.102 c 1.025,0.271 1.625,-0.423 1.899,-1.434 L 0,0 Z"/></g><g transform="translate(21.7875,17.5486)" id="g24"><path id="path26" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.192,-1.075 -1.233,-1.794 -2.325,-1.604 l -0.087,0.015 c -1.091,0.189 -1.819,1.215 -1.627,2.29 l 2.685,15.01 c 0.193,1.076 0.713,1.814 1.805,1.625 l 0.241,-0.073 c 2.77,-0.657 1.621,-4.337 1.993,-2.254 L 0,0 Z"/></g><g transform="translate(11.1357,16.9619)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.259,-0.967 -0.314,-1.961 -1.281,-2.221 l -0.363,-0.096 c -0.966,-0.259 -1.96,0.314 -2.219,1.281 l -3.203,11.953 c -0.259,0.967 0.315,1.962 1.282,2.221 l 0.361,0.096 c 0.967,0.26 1.961,-0.314 2.221,-1.281 L 0,0 Z"/></g><g transform="translate(15.6904,19.2822)" id="g32"><path id="path34" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.269,-1 -0.325,-2.028 -1.325,-2.296 l -0.242,-0.065 c -1,-0.268 -2.029,0.326 -2.296,1.326 l -3.948,14.73 c -0.268,1 0.326,2.029 1.326,2.296 l 0.242,0.065 c 1,0.268 2.028,-0.326 2.297,-1.326 L 0,0 Z"/></g><g transform="translate(20.6836,18.0781)" id="g36"><path id="path38" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.18,-1.02 -1.152,-1.701 -2.172,-1.521 l -0.246,0.044 c -1.02,0.179 -1.701,1.152 -1.521,2.171 l 2.648,15.018 c 0.18,1.019 1.152,1.701 2.172,1.521 L 1.127,17.19 C 2.146,17.011 2.828,16.037 2.648,15.018 L 0,0 Z"/></g><g transform="translate(25.5859,17.0869)" id="g40"><path id="path42" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.168,-0.952 -1.074,-1.588 -2.027,-1.42 l -0.493,0.087 c -0.952,0.168 -1.586,1.075 -1.419,2.027 l 2.518,14.28 c 0.168,0.951 1.075,1.588 2.026,1.42 L 1.099,16.307 C 2.051,16.139 2.686,15.23 2.518,14.279 L 0,0 Z"/></g><g transform="translate(28.9268,8.6406)" id="g44"><path id="path46" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.523,-0.903 -1.677,-1.213 -2.581,-0.691 L -2.773,-0.58 C -3.677,-0.059 -3.986,1.097 -3.464,2 l 5.609,9.718 c 0.523,0.903 1.678,1.214 2.582,0.692 L 4.919,12.299 C 5.823,11.777 6.132,10.621 5.61,9.718 L 0,0 Z"/></g><g transform="translate(6.1826,19.9932)" id="g48"><path id="path50" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.4,-1.493 -0.183,-5.186 -0.183,-7.993 0,-2.808 2.125,-12 12,-12 9.875,0 10.5,8.234 12,10.666 1.5,2.432 -0.833,6.375 -2,4.375 -1.167,-2 -2.933,-1.163 -2.333,2.375 0.601,3.539 -3.12,5.465 -3.635,2.544 C 15.411,-2.51 14.411,-1.786 14.994,0.88 15.577,3.547 11.48,4.3 10.817,0.673 10.33,-1.993 9.365,-0.219 8.966,1.311 8.567,2.84 4.482,2.974 5.015,0.602 5.776,-2.785 5.01,-3.465 3.901,0.673 3.198,3.297 0,0 0,0"/></g><g transform="translate(26.459,13.9854)" id="g52"><path id="path54" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.023,0.002 0.046,0.008 0.069,0.011 -0.319,0.079 -0.644,0.45 -0.804,1.117 -2.721,0.869 -5.39,0.404 -7.459,-1.619 c -2.556,-2.499 -2.992,-5.2 -2.971,-7.007 0.016,-1.457 0.812,-2.146 1.045,0.012 C -9.084,-5.819 -7.037,-0.574 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path d="M14.849 17.549c.274 1.01-.334 2.049-1.36 2.322l-.247.065c-1.026.27-2.079-.33-2.354-1.341L7.174 4.935c-.471-1.641-.147-3.183 1.28-3.6l.449-.103c1.025-.271 1.625.424 1.899 1.434l4.047 14.883zm6.939.902c-.192 1.075-1.233 1.794-2.325 1.604l-.087-.015c-1.091-.189-1.82-1.216-1.627-2.291l2.686-15.01c.192-1.075.713-1.814 1.804-1.625l.241.073c2.77.657 1.621 4.337 1.993 2.254l-2.685 15.01z" fill="#D2A077"/><path fill="#F3D2A2" d="M11.136 19.038c.259.967-.314 1.961-1.281 2.221l-.362.097c-.967.259-1.961-.314-2.22-1.281L4.069 8.121c-.258-.967.316-1.962 1.283-2.221l.361-.097c.967-.26 1.961.314 2.221 1.281l3.202 11.954zm4.554-2.32c.269 1-.325 2.028-1.325 2.296l-.242.065c-1 .268-2.028-.326-2.296-1.326L7.88 3.022c-.269-1 .325-2.028 1.325-2.296l.242-.065c1-.268 2.028.326 2.297 1.326l3.946 14.731zm4.994 1.204c-.18 1.02-1.152 1.701-2.172 1.521l-.246-.044c-1.02-.18-1.701-1.152-1.521-2.172L19.393 2.21c.18-1.02 1.152-1.701 2.172-1.521l.246.043c1.02.18 1.701 1.153 1.522 2.173l-2.649 15.017zm4.902.991c-.168.952-1.074 1.588-2.027 1.42l-.492-.087c-.952-.168-1.587-1.075-1.42-2.027L24.166 3.94c.168-.951 1.075-1.588 2.026-1.42l.493.087c.952.168 1.587 1.076 1.419 2.027l-2.518 14.279zm3.341 8.446c-.522.903-1.677 1.213-2.581.691l-.191-.111c-.904-.522-1.214-1.677-.691-2.58l5.609-9.718c.522-.903 1.678-1.214 2.582-.692l.191.111c.904.521 1.213 1.678.691 2.581l-5.61 9.718z"/><path fill="#F3D2A2" d="M6.183 16.007C6.583 17.5 6 21.192 6 24s2.125 12 12 12 10.5-8.234 12-10.666c1.5-2.432-.833-6.375-2-4.375s-2.934 1.163-2.333-2.375-3.12-5.464-3.636-2.544c-.438 2.477-1.438 1.753-.854-.913.583-2.667-3.514-3.42-4.177.207-.487 2.667-1.452.892-1.851-.637s-4.484-1.664-3.951.709c.761 3.387-.005 4.067-1.114-.071-.704-2.625-3.901.672-3.901.672z"/><path fill="#D2A077" d="M26.459 22.015c.023-.002.046-.008.069-.011-.389-.068-.713-.439-.873-1.106-1.917.248-4.586.713-6.655 2.736-2.556 2.499-2.992 5.2-2.971 7.007.017 1.457.812 2.147 1.045-.012.301-2.795 2.348-8.04 9.385-8.614z"/></svg> \ No newline at end of file |