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/1f50d.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/1f50d.svg')
-rw-r--r-- | public/emoji/1f50d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f50d.svg b/public/emoji/1f50d.svg index 098d5e081..038bbc24f 100644 --- a/public/emoji/1f50d.svg +++ b/public/emoji/1f50d.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(25.4854,13.3438)" id="g20"><path id="path22" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.711,3.711 c 1.396,1.962 2.226,4.354 2.226,6.945 0,6.628 -5.373,12 -12,12 -6.628,0 -12,-5.372 -12,-12 0,-6.627 5.372,-12 12,-12 2.591,0 4.984,0.83 6.945,2.227 L -2.828,-2.828 0,0 Z"/></g><g transform="translate(20,24)" id="g24"><path id="path26" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-4.419 -3.581,-8 -8,-8 -4.418,0 -8,3.581 -8,8 0,4.419 3.582,8 8,8 4.419,0 8,-3.581 8,-8"/></g><g transform="translate(34.7275,6.8281)" id="g28"><path id="path30" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -8.485,8.484 c -0.782,0.782 -2.047,0.782 -2.828,0 l -2.829,-2.828 c -0.781,-0.781 -0.781,-2.047 0,-2.828 L -11.313,0 -5.657,-5.656 c 1.562,-1.563 4.095,-1.563 5.658,0 C 1.562,-4.096 1.562,-1.562 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9AAAB4" d="M27.388 24.642L24.56 27.47l-4.95-4.95 2.828-2.828z"/><path fill="#66757F" d="M34.683 29.11l-5.879-5.879c-.781-.781-2.047-.781-2.828 0l-2.828 2.828c-.781.781-.781 2.047 0 2.828l5.879 5.879c1.562 1.563 4.096 1.563 5.658 0 1.56-1.561 1.559-4.094-.002-5.656z"/><circle fill="#8899A6" cx="13.586" cy="13.669" r="13.5"/><circle fill="#BBDDF5" cx="13.586" cy="13.669" r="9.5"/></svg> \ No newline at end of file |