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/1f98c.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/1f98c.svg')
-rw-r--r-- | public/emoji/1f98c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f98c.svg b/public/emoji/1f98c.svg index 5a753e0d1..86623680c 100644 --- a/public/emoji/1f98c.svg +++ b/public/emoji/1f98c.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(15.9712,20.9165)" id="g20"><path id="path22" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.458,2.333 -0.667,7.708 0,8.958 0.667,1.25 -0.542,2.459 -1.5,0.459 -0.958,-2 -0.996,-3 -3.162,-2.459 -2.167,0.543 -1.088,3.292 -0.38,5.625 0.73,2.401 -0.916,1.959 -1.666,0.459 -0.75,-1.5 -1.254,-5.693 -2.901,-5.984 -1.647,-0.292 -6.099,-0.6 -2.851,5.65 1.307,2.515 -0.738,3.032 -1.832,0.917 -1.318,-2.549 -2.083,-5.792 -1.458,-7.167 1.113,-2.448 3.483,-2.95 6.983,-2.283 3.5,0.666 6.1,0.634 6.1,-1.133 0,-1.873 0.209,-3.459 1.042,-3.625 C -0.792,-0.75 0,0 0,0"/></g><g transform="translate(20.0283,20.9165)" id="g24"><path id="path26" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.458,2.333 0.667,7.708 0,8.958 -0.667,1.25 0.542,2.459 1.5,0.459 0.958,-2 0.996,-3 3.162,-2.459 2.166,0.543 1.088,3.292 0.379,5.625 -0.729,2.401 0.917,1.959 1.667,0.459 0.75,-1.5 1.254,-5.693 2.901,-5.984 1.647,-0.292 6.099,-0.6 2.851,5.65 -1.307,2.515 0.737,3.032 1.831,0.917 C 15.609,11.076 16.375,7.833 15.75,6.458 14.637,4.01 12.268,3.508 8.768,4.175 5.268,4.841 2.666,4.809 2.666,3.042 2.666,1.169 2.458,-0.417 1.625,-0.583 0.792,-0.75 0,0 0,0"/></g><g transform="translate(13.8594,20.5049)" id="g28"><path id="path30" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.596,-2.392 0.16,-4.422 -2.232,-5.017 -2.392,-0.595 -6.344,-0.558 -7.958,1.303 -2.294,2.647 -2.531,6.391 -1.189,6.725 C -10.038,3.345 -0.595,2.392 0,0"/></g><g transform="translate(22.1416,20.5049)" id="g32"><path id="path34" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.596,-2.392 -0.16,-4.422 2.231,-5.017 2.392,-0.595 6.345,-0.558 7.958,1.303 2.295,2.647 2.532,6.391 1.19,6.725 C 10.038,3.345 0.596,2.392 0,0"/></g><g transform="translate(2.48,23.5156)" id="g36"><path id="path38" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.943,-0.235 -1.102,-2.157 -0.317,-4.198 l 3.374,4.135 C 1.6,0.083 0.414,0.103 0,0"/></g><g transform="translate(33.5205,23.5156)" id="g40"><path id="path42" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.419,0.105 -1.632,0.083 -3.118,-0.069 L 0.327,-4.175 C 1.102,-2.143 0.94,-0.234 0,0"/></g><g transform="translate(12.0518,20.0034)" id="g44"><path id="path46" style="fill:#e6aaaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.871,-1.393 -0.553,-2.229 -1.946,-3.099 -3.339,-3.97 -6.554,-2.896 -7.424,-1.503 -8.295,-0.11 -8.61,1.628 -8.1,1.946 -7.59,2.265 -0.871,1.394 0,0"/></g><g transform="translate(23.9482,20.0034)" id="g48"><path id="path50" style="fill:#e6aaaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.871,-1.393 0.553,-2.229 1.945,-3.099 3.34,-3.97 6.554,-2.896 7.424,-1.503 8.295,-0.11 8.609,1.628 8.1,1.946 7.59,2.265 0.871,1.394 0,0"/></g><g transform="translate(18,21.875)" id="g52"><path id="path54" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 -0.001,0 -0.002,0 c -10.27,-0.001 -8.703,-3.959 -7.602,-10.541 1.1,-6.584 2.401,-11.256 7.605,-11.256 5.203,0 6.502,4.672 7.604,11.256 C 8.703,-3.959 10.27,-0.001 0,0"/></g><g transform="translate(11.8262,13.1494)" id="g56"><path id="path58" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.75,1.299 0.549,2.049 1.848,2.799 2.598,1.5 2.598,1.5 l 0.75,-1.299 c 0,0 0.75,-1.299 -0.549,-2.049 C 1.5,-2.598 0.75,-1.299 0.75,-1.299 L 0,0 Z"/></g><g transform="translate(21.5762,14.6494)" id="g60"><path id="path62" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.75,1.299 2.049,0.549 3.348,-0.201 2.598,-1.5 2.598,-1.5 l -0.75,-1.299 c 0,0 -0.75,-1.299 -2.049,-0.549 -1.299,0.75 -0.549,2.049 -0.549,2.049 L 0,0 Z"/></g><g transform="translate(15.2256,1.7344)" id="g64"><path id="path66" style="fill:#272b2b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.925,0.188 1.85,3.596 2.774,3.596 3.699,3.596 6.474,0.188 5.549,0 4.624,-0.188 0.925,-0.188 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M15.971 15.083c-1.458-2.333-.667-7.708 0-8.958s-.542-2.458-1.5-.458-.996 3-3.162 2.458-1.088-3.292-.379-5.625c.729-2.4-.917-1.959-1.667-.458-.75 1.5-1.254 5.693-2.901 5.984-1.647.291-6.099.599-2.851-5.651C4.818-.139 2.773-.656 1.68 1.459.361 4.007-.404 7.25.221 8.625c1.113 2.448 3.483 2.95 6.983 2.284s6.101-.634 6.101 1.133c0 1.872.208 3.458 1.042 3.625s1.624-.584 1.624-.584zm4.057 0c1.458-2.333.667-7.708 0-8.958s.542-2.458 1.5-.458.996 3 3.162 2.458 1.088-3.292.379-5.625c-.729-2.4.917-1.959 1.667-.458s1.254 5.693 2.901 5.984c1.647.292 6.099.599 2.851-5.651-1.307-2.514.737-3.031 1.831-.916 1.318 2.549 2.084 5.792 1.459 7.167-1.113 2.448-3.482 2.95-6.982 2.284s-6.102-.634-6.102 1.133c0 1.872-.208 3.458-1.041 3.625s-1.625-.585-1.625-.585z"/><path fill="#C1694F" d="M13.859 15.495c.596 2.392.16 4.422-2.231 5.017-2.392.596-6.344.559-7.958-1.303-2.294-2.646-2.531-6.391-1.189-6.725 1.34-.334 10.783.62 11.378 3.011zm8.283 0c-.596 2.392-.16 4.422 2.231 5.017 2.392.596 6.345.559 7.958-1.303 2.295-2.646 2.531-6.391 1.189-6.725-1.34-.334-10.783.62-11.378 3.011z"/><path fill="#272B2B" d="M2.48 12.484c-.943.235-1.102 2.157-.317 4.198l3.374-4.134c-1.457-.146-2.643-.167-3.057-.064zm31.041 0c-.419-.104-1.632-.083-3.118.069l3.445 4.106c.774-2.032.613-3.941-.327-4.175z"/><path fill="#E6AAAA" d="M12.052 15.997c.871 1.393-.553 2.229-1.946 3.099-1.394.871-4.608-.203-5.479-1.596-.871-1.394-1.186-3.131-.676-3.45.51-.318 7.23.553 8.101 1.947zm11.896 0c-.871 1.393.553 2.229 1.945 3.099 1.394.871 4.608-.203 5.479-1.596.871-1.394 1.185-3.131.676-3.45-.51-.318-7.229.553-8.1 1.947z"/><path fill="#C1694F" d="M18 14.125h-.002c-10.271.001-8.703 3.959-7.603 10.541 1.1 6.584 2.401 11.256 7.605 11.256 5.203 0 6.502-4.672 7.604-11.256 1.099-6.582 2.666-10.54-7.604-10.541z"/><path fill="#272B2B" d="M11.826 22.851s-.75-1.299.549-2.049 2.049.549 2.049.549l.75 1.299s.75 1.299-.549 2.049-2.049-.549-2.049-.549l-.75-1.299zm9.75-1.5s.75-1.299 2.049-.549.549 2.049.549 2.049l-.75 1.299s-.75 1.299-2.049.549-.549-2.049-.549-2.049l.75-1.299zm-6.35 12.915c-.925-.188 1.85-3.596 2.774-3.596s3.699 3.407 2.774 3.596c-.924.188-4.624.188-5.548 0z"/></svg> \ No newline at end of file |