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/1f1fb-1f1fa.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/1f1fb-1f1fa.svg')
-rw-r--r-- | public/emoji/1f1fb-1f1fa.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1fb-1f1fa.svg b/public/emoji/1f1fb-1f1fa.svg index 7595f2f72..151e7aaa7 100644 --- a/public/emoji/1f1fb-1f1fa.svg +++ b/public/emoji/1f1fb-1f1fa.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 4,31 C 1.791,31 0,29.209 0,27 L 0,27 0,9 C 0,6.791 1.791,5 4,5 l 0,0 28,0 c 2.209,0 4,1.791 4,4 l 0,0 0,18 c 0,2.209 -1.791,4 -4,4 l 0,0 -28,0 z"/></clipPath><clipPath id="clipPath46" clipPathUnits="userSpaceOnUse"><path id="path48" 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(36,9)" id="g20"><path id="path22" style="fill:#d21034;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 l -28,0 c -2.209,0 -4,1.791 -4,4 l 0,18 c 0,2.209 1.791,4 4,4 l 28,0 c 2.209,0 4,-1.791 4,-4 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><path id="path32" style="fill:#009543;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,18 0,18 0,5 36,5 36,18 Z"/><g transform="translate(-1,31.9585)" id="g34"><path id="path36" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 18,-10.958 19,0 0,-6 -19,0 -18,-11 L 0,0 Z"/></g><g transform="translate(36,19)" id="g38"><path id="path40" style="fill:#fdce12;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-2 -19,0 -18,-11 0,24 18,-11 19,0 z"/></g></g></g><g id="g42"><g clip-path="url(#clipPath46)" id="g44"><g transform="translate(0,27)" id="g50"><path id="path52" style="fill:#141414;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 15,-9 0,-18 0,0 Z"/></g><g transform="translate(4.375,14.3945)" id="g54"><path id="path56" style="fill:#fdce12;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 3.25,0.5 3.25,3.71 0,1.973 -1.708,3.062 -3.042,3.062 -1.333,0 -2.75,-0.999 -2.75,-2.75 0,-1.751 1.625,-2.292 2.417,-2.292 0.792,0 2,0.625 1.833,2 C 1.244,1.817 -0.704,1.872 -1.458,3.022 -2.292,4.293 -1,6.105 0.667,5.605 2.246,5.132 2.328,3.525 1.792,2.521 1.125,1.271 0.021,1.334 0.021,1.334 L 0,0 Z"/></g><g transform="translate(3.417,17.2705)" id="g58"><path id="path60" style="fill:#fdce12;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.032,0.446 0.167,0.708 0.812,1.562 1.958,2.167 2.104,2.083 2.25,2 1.708,1.834 1.146,1.167 0.876,0.848 0.713,0.54 0.5,0.333 0.269,0.108 0,0 0,0"/></g><g transform="translate(5.543,17.2705)" id="g62"><path id="path64" style="fill:#fdce12;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.032,0.446 -0.167,0.708 -0.812,1.562 -1.958,2.167 -2.104,2.083 -2.25,2 -1.708,1.834 -1.146,1.167 -0.876,0.848 -0.713,0.54 -0.5,0.333 -0.269,0.108 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D21034" d="M32 5H4C1.791 5 0 6.791 0 9v9h36V9c0-2.209-1.791-4-4-4z"/><path fill="#009543" d="M4 31h28c2.209 0 4-1.791 4-4v-9H0v9c0 2.209 1.791 4 4 4z"/><path fill="#141414" d="M17 15L1.732 5.705c-.474.327-.874.754-1.17 1.25l-.002.002C.205 7.555 0 8.254 0 9v18c0 .747.205 1.447.562 2.045l.001.003c.301.504.71.937 1.195 1.265h.001L17 21h19v-6H17z"/><path fill="#FDCE12" d="M.562 6.955l-.002.002C.205 7.555 0 8.254 0 9l15 9-15 9c0 .747.205 1.447.562 2.045L17 19h19v-2H17L.562 6.955z"/><path fill="#FDCE12" d="M4.375 21.606s3.25-.5 3.25-3.71c0-1.974-1.708-3.062-3.042-3.062-1.333 0-2.75 1-2.75 2.75s1.625 2.292 2.417 2.292 2-.625 1.833-2c-.464 1.913-2.413 1.858-3.167.708-.833-1.271.459-3.084 2.126-2.584 1.579.474 1.661 2.081 1.125 3.084-.667 1.25-1.771 1.188-1.771 1.188l-.021 1.334z"/><path fill="#FDCE12" d="M5.376 18.021c-.183-.242-.407-.461-.636-.653.492-.505.911-.648.781-.722-.089-.051-.549.156-1.041.516-.492-.36-.952-.567-1.041-.516-.13.075.289.218.781.722-.229.192-.453.41-.636.653-.199.263-.167.708-.167.708s.269-.108.5-.333c.187-.181.347-.446.563-.723.216.277.376.542.563.723.231.225.5.333.5.333s.032-.445-.167-.708z"/></svg> \ No newline at end of file |