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/1f9c0.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/1f9c0.svg')
-rw-r--r-- | public/emoji/1f9c0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9c0.svg b/public/emoji/1f9c0.svg index a9ebf6ccc..20e6a92f3 100644 --- a/public/emoji/1f9c0.svg +++ b/public/emoji/1f9c0.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="clipPath20" clipPathUnits="userSpaceOnUse"><path id="path22" 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 transform="translate(11.7915,29.9375)" id="g12"><path id="path14" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.01,-3.323 5.337,-1.937 2.401,0.062 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(33.25,12.5176)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.138 0.761,2.071 1.75,2.238 l 0,11.659 c -4,0.962 -34,-7.191 -34,-7.191 l 0,-3.536 c 1.564,-0.294 2.75,-1.662 2.75,-3.313 0,-1.65 -1.186,-3.018 -2.75,-3.312 l 0,-7.716 34,6.483 0,2.451 C 0.761,-2.07 0,-1.137 0,0"/></g><g transform="translate(15.5854,33.7578)" id="g28"><path id="path30" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.843,-3.843 c 0.736,-0.172 1.258,-0.591 1.258,-1.081 0,-0.645 -0.896,-1.167 -2,-1.167 -0.474,0 -0.903,0.1 -1.246,0.26 l -8.754,-8.754 C -1.418,-11.675 7.457,-9.3 19.514,-7.36 14.653,-0.877 3.241,0 0,0"/></g><g transform="translate(20,30.8335)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.645 -0.895,-1.167 -2,-1.167 -1.104,0 -2,0.522 -2,1.167 0,0.644 0.896,1.167 2,1.167 1.105,0 2,-0.523 2,-1.167"/></g><g transform="translate(15.0718,24.438)" id="g36"><path id="path38" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.979 -1.359,-1.771 -3.036,-1.771 -1.676,0 -3.036,0.792 -3.036,1.771 0,0.977 1.36,1.77 3.036,1.77 C -1.359,1.77 0,0.977 0,0"/></g><g transform="translate(29,27.6479)" id="g40"><path id="path42" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.094 -1.52,-1.981 -3.396,-1.981 -1.875,0 -3.396,0.887 -3.396,1.981 0,1.094 1.521,1.981 3.396,1.981 C -1.52,1.981 0,1.094 0,0"/></g><g transform="translate(33.625,20.3804)" id="g44"><path id="path46" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.332 -0.979,-2.411 -2.188,-2.411 -1.207,0 -2.187,1.079 -2.187,2.411 0,1.331 0.98,2.411 2.187,2.411 C -0.979,2.411 0,1.331 0,0"/></g><g transform="translate(11.375,15.5176)" id="g48"><path id="path50" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.255 -0.923,-2.272 -2.063,-2.272 -1.139,0 -2.062,1.017 -2.062,2.272 0,1.256 0.923,2.273 2.062,2.273 C -0.923,2.273 0,1.256 0,0"/></g><g transform="translate(28.5313,10.5381)" id="g52"><path id="path54" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.503,-0.602 -1.355,-0.72 -1.903,-0.262 -2.45,0.195 -2.485,1.056 -1.98,1.657 -1.476,2.262 -0.624,2.379 -0.077,1.922 0.471,1.464 0.505,0.604 0,0"/></g><g transform="translate(18.8472,17.916)" id="g56"><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.677,-0.811 -1.825,-0.97 -2.563,-0.352 -3.298,0.263 -3.346,1.42 -2.666,2.23 -1.986,3.044 -0.84,3.202 -0.104,2.586 0.633,1.97 0.68,0.814 0,0"/></g><g transform="translate(19.7197,7.9014)" id="g60"><path id="path62" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.2,-1.604 -3.354,-2.02 -4.808,-0.933 -1.455,1.088 -1.663,3.273 -0.463,4.875 1.2,1.606 3.354,2.023 4.808,0.935 C 0.992,3.789 1.2,1.605 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M11.792 6.062l-.011 3.324L17.129 8l-2.936-2zm21.458 17.42c0-1.138.761-2.071 1.75-2.238V9.585c-4-.962-34 7.191-34 7.191v3.536c1.564.294 2.75 1.662 2.75 3.312S2.564 26.644 1 26.938v7.716l34-6.482v-2.451c-.989-.168-1.75-1.102-1.75-2.239z"/><path fill="#FFD983" d="M15.585 2.242l-3.843 3.843c.737.172 1.258.591 1.258 1.082 0 .645-.896 1.167-2 1.167-.474 0-.903-.1-1.245-.26L1 16.828c13.167-2.911 22.042-5.286 34.1-7.226-4.862-6.482-16.273-7.36-19.515-7.36z"/><path fill="#FFAC33" d="M20 5.167c0 .645-.896 1.167-2 1.167s-2-.522-2-1.167S16.896 4 18 4s2 .522 2 1.167zm-4.928 6.395c0 .978-1.359 1.771-3.036 1.771S9 12.54 9 11.562c0-.977 1.359-1.771 3.036-1.771 1.676.001 3.036.794 3.036 1.771zM29 8.352c0 1.094-1.521 1.981-3.396 1.981s-3.396-.887-3.396-1.981 1.521-1.981 3.396-1.981S29 7.258 29 8.352z"/><path fill="#F4900C" d="M33.625 15.62c0 1.332-.979 2.411-2.188 2.411s-2.188-1.079-2.188-2.411.979-2.411 2.188-2.411 2.188 1.079 2.188 2.411zm-22.25 4.862c0 1.255-.923 2.272-2.062 2.272-1.139 0-2.062-1.018-2.062-2.272 0-1.256.923-2.273 2.062-2.273 1.139 0 2.062 1.018 2.062 2.273zm17.156 4.98c-.503.602-1.355.72-1.903.262-.547-.457-.582-1.317-.077-1.919.505-.605 1.356-.722 1.903-.265.548.458.582 1.317.077 1.922zm-9.684-7.378c-.677.811-1.825.97-2.562.353-.736-.615-.783-1.773-.104-2.583.68-.814 1.826-.971 2.562-.356.737.616.784 1.773.104 2.586zm.873 10.015c-1.2 1.604-3.354 2.021-4.808.933-1.455-1.088-1.663-3.272-.463-4.875 1.2-1.605 3.354-2.022 4.808-.935 1.455 1.088 1.663 3.272.463 4.877z"/></svg> \ No newline at end of file |