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/1f54e.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/1f54e.svg')
-rw-r--r-- | public/emoji/1f54e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f54e.svg b/public/emoji/1f54e.svg index aa69dd7e1..1ebcec52f 100644 --- a/public/emoji/1f54e.svg +++ b/public/emoji/1f54e.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(36,4)" id="g20"><path id="path22" style="fill:#9266cc;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,28 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 transform="translate(33.25,24)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 c 0,-7 -5.411,-12.687 -12.25,-13.202 l 0,1.563 C -8.273,-11.129 -3.563,-6 -3.563,0 l -1.999,0 c 0,-5 -3.814,-9.136 -8.688,-9.638 l 0,1.578 c 4.009,0.496 7.125,4.06 7.125,8.06 l -2,0 c 0,-3 -2.223,-5.559 -5.125,-6.039 l 0,1.562 c 2.051,0.459 3.592,2.477 3.592,4.477 l -2,0 c 0,-1 -0.658,-2 -1.592,-2.392 l 0,3.392 -2,0 0,-3.392 C -17.184,-2 -17.841,-1 -17.841,0 l -2,0 c 0,-2 1.54,-4.018 3.591,-4.477 l 0,-1.562 C -19.152,-5.559 -21.375,-3 -21.375,0 l -2,0 c 0,-4 3.116,-7.564 7.125,-8.06 l 0,-1.578 C -21.124,-9.136 -24.937,-5 -24.937,0 l -2,0 c 0,-6 4.71,-11.129 10.687,-11.639 l 0,-1.563 C -23.089,-12.687 -28.5,-7 -28.5,0 l -2,0 c 0,-8 6.308,-14.683 14.25,-15.202 l 0,-1.798 -3,0 c -1.104,0 -2,-0.896 -2,-2 l -2,0 c -0.552,0 -1,-0.447 -1,-1 0,-0.553 0.448,-1 1,-1 l 4,0 8,0 4,0 c 0.553,0 1,0.447 1,1 0,0.553 -0.447,1 -1,1 l -2,0 c 0,1.104 -0.896,2 -2,2 l -3,0 0,1.798 C -6.307,-14.683 0,-8 0,0"/></g><g transform="translate(32.25,30.948)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.303,0 -0.886,-1.582 -0.985,-3.918 -0.024,-0.559 0.425,-1.03 0.985,-1.03 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(28.6875,30.948)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(25.125,30.948)" id="g36"><path id="path38" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(21.5625,30.948)" id="g40"><path id="path42" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(18,31.9488)" id="g44"><path id="path46" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(14.4375,30.948)" id="g48"><path id="path50" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(10.875,30.948)" id="g52"><path id="path54" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(7.3125,30.948)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g><g transform="translate(3.75,30.948)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.303,0 -0.886,-1.582 -0.985,-3.918 -1.009,-4.477 -0.56,-4.948 0,-4.948 l 0,0 c 0.56,0 1.009,0.471 0.985,1.03 C 0.886,-1.582 0.303,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M33.25 12h-2c0 7-5.411 12.687-12.25 13.202v-1.563C24.977 23.129 29.688 18 29.688 12h-2c0 5-3.814 9.136-8.688 9.638V20.06c4.009-.495 7.125-4.06 7.125-8.06h-2c0 3-2.223 5.559-5.125 6.039v-1.562C21.051 16.018 22.592 14 22.592 12h-2c0 1-.658 2-1.592 2.392V11h-2v3.392C16.066 14 15.409 13 15.409 12h-2c0 2 1.54 4.018 3.591 4.477v1.562C14.098 17.559 11.875 15 11.875 12h-2c0 4 3.116 7.564 7.125 8.06v1.579C12.126 21.136 8.312 17 8.312 12h-2c0 6 4.71 11.129 10.688 11.639v1.563C10.161 24.687 4.75 19 4.75 12h-2c0 8 6.308 14.683 14.25 15.202V29h-3c-1.104 0-2 .896-2 2h-2c-.552 0-1 .447-1 1s.448 1 1 1h16c.553 0 1-.447 1-1s-.447-1-1-1h-2c0-1.104-.896-2-2-2h-3v-1.798C26.943 26.683 33.25 20 33.25 12zm-1-6.948c-.303 0-.886 1.582-.985 3.918-.024.559.425 1.03.985 1.03s1.009-.471.985-1.03c-.099-2.336-.682-3.918-.985-3.918zm-3.562 0c-.303 0-.886 1.582-.985 3.918-.025.559.425 1.03.984 1.03.56 0 1.009-.471.985-1.03-.099-2.336-.682-3.918-.984-3.918zm-3.563 0c-.303 0-.886 1.582-.985 3.918-.024.559.425 1.03.985 1.03s1.009-.471.985-1.03c-.099-2.336-.682-3.918-.985-3.918zm-3.563 0c-.303 0-.886 1.582-.985 3.918-.024.559.426 1.03.985 1.03.56 0 1.009-.471.985-1.03-.099-2.336-.682-3.918-.985-3.918zM18 4.051c-.303 0-.886 1.582-.985 3.918-.024.559.425 1.03.985 1.03s1.009-.471.985-1.03c-.099-2.336-.682-3.918-.985-3.918zm-3.562 1.001c-.303 0-.886 1.582-.985 3.918-.025.559.425 1.03.984 1.03.56 0 1.009-.471.985-1.03-.099-2.336-.682-3.918-.984-3.918zm-3.563 0c-.303 0-.886 1.582-.985 3.918-.024.559.425 1.03.985 1.03s1.009-.471.985-1.03c-.099-2.336-.682-3.918-.985-3.918zm-3.563 0c-.303 0-.886 1.582-.985 3.918-.024.559.426 1.03.985 1.03.56 0 1.009-.471.985-1.03-.099-2.336-.682-3.918-.985-3.918zm-3.562 0c-.303 0-.886 1.582-.985 3.918-.024.559.425 1.03.985 1.03s1.009-.471.985-1.03c-.099-2.336-.682-3.918-.985-3.918z"/></svg> \ No newline at end of file |