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/1f4b7.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/1f4b7.svg')
| -rw-r--r-- | public/emoji/1f4b7.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4b7.svg b/public/emoji/1f4b7.svg index c619edaad..93a16ff62 100644 --- a/public/emoji/1f4b7.svg +++ b/public/emoji/1f4b7.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(2,30)" id="g20"><path id="path22" style="fill:#cbb8e9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2,0 -2,-2 -2,-2 l 0,-20 c 0,0 0,-2 2,-2 l 32,0 c 2,0 2,2 2,2 l 0,20 c 0,0 0,2 -2,2 L 0,0 Z"/></g><path id="path24" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 23,5.937 -10,0 0,24.062 10,0 0,-24.062 z"/><g transform="translate(8.02,22.9907)" id="g26"><path id="path28" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.439,0 0.755,-0.228 0.755,-0.72 0.755,-1.212 0.439,-1.44 0,-1.44 l -1.915,0 c 0.053,-0.299 0.123,-0.632 0.123,-1.16 0,-0.825 -0.544,-2.089 -1.51,-2.95 l 5.919,0 c 0.44,0 0.756,-0.228 0.756,-0.72 0,-0.492 -0.316,-0.721 -0.756,-0.721 l -7.026,0 c -0.491,0 -0.93,0.123 -0.93,0.739 0,0.753 2.002,1.579 2.002,3.67 0,0.316 -0.018,0.755 -0.123,1.142 l -1.774,0 c -0.439,0 -0.755,0.228 -0.755,0.72 0,0.492 0.316,0.72 0.755,0.72 l 1.352,0 c -0.421,0.755 -0.86,1.581 -0.86,2.511 0,1.845 1.809,3.11 3.793,3.11 2.091,0 4.022,-1.722 4.022,-3.11 C 3.073,2.037 2.775,1.756 2.336,1.756 1.16,1.756 1.774,4.18 -0.931,4.18 -2.073,4.18 -3.197,3.565 -3.197,2.406 -3.197,1.475 -2.67,0.773 -2.266,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CBB8E9" d="M2 6C0 6 0 8 0 8v20s0 2 2 2h32c2 0 2-2 2-2V8s0-2-2-2H2z"/><path fill="#9AAAB4" d="M13 6h10v24.062H13z"/><path fill="#67757F" d="M8.02 13.009c.439 0 .755.228.755.72s-.316.72-.755.72H6.105c.053.299.123.632.123 1.159 0 .826-.544 2.09-1.51 2.951h5.919c.44 0 .756.227.756.72 0 .492-.316.721-.756.721H3.611c-.491 0-.931-.123-.931-.738 0-.754 2.002-1.58 2.002-3.67 0-.316-.018-.755-.123-1.142H2.786c-.439 0-.755-.228-.755-.72s.316-.72.755-.72h1.353c-.421-.755-.86-1.581-.86-2.511 0-1.845 1.809-3.109 3.793-3.109 2.09 0 4.022 1.722 4.022 3.109 0 .474-.298.755-.737.755-1.177 0-.562-2.424-3.268-2.424-1.142 0-2.266.615-2.266 1.774 0 .931.527 1.633.931 2.406H8.02z"/></svg> \ No newline at end of file |
