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/26c8.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/26c8.svg')
-rw-r--r-- | public/emoji/26c8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26c8.svg b/public/emoji/26c8.svg index 86e3c01ca..878ba81b9 100644 --- a/public/emoji/26c8.svg +++ b/public/emoji/26c8.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(13.9165,0)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.091,0 -0.182,0.029 -0.258,0.089 -0.415,0.213 -0.462,0.43 -0.371,0.607 L 3.083,7 -1.995,7 C -2.169,7 -2.432,7.031 -2.557,7.297 -2.671,7.54 -2.614,7.771 -2.51,8 l 3.593,9 c 0.079,0.067 6.903,-0.393 7,-0.393 0.09,0 0.182,-0.029 0.257,-0.088 C 8.498,16.395 8.544,16.178 8.453,16 L 4.635,10 9.667,10 C 9.841,10 9.997,9.892 10.058,9.729 10.118,9.565 10.071,9.382 9.939,9.268 L 0.272,0.102 C 0.194,0.034 0.097,0 0,0"/></g><g transform="translate(28,32)" id="g24"><path id="path26" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.825,0 -1.62,-0.125 -2.369,-0.357 -3.256,2.178 -5.662,4 -8.5,4 -11.544,4 -14.092,1.904 -14.799,-0.921 -15.553,-0.351 -16.481,0 -17.5,0 -19.985,0 -22,-2.015 -22,-4.5 c 0,-0.604 0.123,-1.178 0.339,-1.704 C -22.09,-6.085 -22.533,-6 -23,-6 c -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.238,-5 5,-5 l 23,0 c 4.418,0 8,3.581 8,8 0,4.418 -3.582,8 -8,8"/></g><g transform="translate(10.999,11.0391)" id="g28"><path id="path30" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.188 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(8.999,3.0391)" id="g32"><path id="path34" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.188 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(4.02,8.5791)" id="g36"><path id="path38" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.983,1.713 C -3.622,1.368 -4.045,0.688 -4.019,-0.086 -3.982,-1.189 -3.053,-2.062 -1.943,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(29.0195,11.0391)" id="g40"><path id="path42" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.018,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(27.0195,2.0391)" id="g44"><path id="path46" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.018,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g><g transform="translate(33.0195,6.0391)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.113,3.421 -2.982,1.713 C -3.621,1.368 -4.045,0.688 -4.018,-0.086 -3.981,-1.188 -3.053,-2.062 -1.942,-2.039 -0.833,-2.016 0.037,-1.103 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M13.917 36c-.091 0-.182-.029-.258-.089-.157-.124-.204-.341-.113-.518L17 29h-5.078c-.174 0-.438-.031-.562-.297-.114-.243-.057-.474.047-.703L15 19c.078-.067 6.902.393 7 .393.09 0 .182.029.257.089.157.124.204.341.112.519l-3.817 6h5.032c.174 0 .329.108.391.271.06.163.013.347-.119.461l-9.666 9.166c-.079.067-.176.101-.273.101z"/><path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/><path fill="#5DADEC" d="M10.999 24.961l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.109-.023 1.98-.937 1.943-2.039zm-2 8l-.113-3.421-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.102.966 1.975 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm-4.979-5.54L3.907 24l-2.87 1.708c-.638.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.11-.023 1.98-.937 1.943-2.039zm25-2.46l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm-2 9l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.102.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039zm6-4l-.113-3.421-2.869 1.708c-.639.345-1.062 1.024-1.036 1.799.037 1.103.966 1.976 2.076 1.953 1.109-.023 1.979-.937 1.942-2.039z"/></svg> \ No newline at end of file |