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/1f6d2.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/1f6d2.svg')
-rw-r--r-- | public/emoji/1f6d2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6d2.svg b/public/emoji/1f6d2.svg index fa7ec4adf..03608d5f5 100644 --- a/public/emoji/1f6d2.svg +++ b/public/emoji/1f6d2.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(31,14)" id="g12"><path id="path14" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -20,0 -22,12 2,12 0,0 Z"/></g><g id="g16"><g clip-path="url(#clipPath20)" id="g18"><g transform="translate(13.6675,25)" id="g24"><path id="path26" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.273,-2 -3.154,-2 -3.487,0 0,0 Z m 6.333,0 0,-2 -4.041,0 -0.274,2 4.315,0 z m 6.313,0 -0.273,-2 -4.04,0 0,2 4.313,0 z m 5.506,0 -0.333,-2 -3.427,0 0.274,2 3.486,0 z m -4.853,-10 0.273,2 3.247,0 -0.333,-2 -3.187,0 z m -4.966,0 0,2 3.22,0 -0.273,-2 -2.947,0 z m -4.948,0 -0.273,2 3.221,0 0,-2 -2.948,0 z m -5.205,0 -0.334,2 3.247,0 0.274,-2 -3.187,0 z m 2.64,4 -3.307,0 -0.333,2 3.367,0 0.273,-2 z m 5.513,0 -3.494,0 -0.274,2 3.768,0 0,-2 z m 5.493,0 -3.493,0 0,2 3.767,0 -0.274,-2 z m 5.326,0 -3.306,0 0.273,2 3.366,0 -0.333,-2 z m 2.165,-10 -22,0 c -1.094,0 -1.984,0.891 -1.984,1.984 0,1.094 0.905,2.016 2,2.016 0.002,0 0.004,10e-4 0.006,10e-4 0.003,0 0.005,-10e-4 0.008,-10e-4 l 19.986,0 c 0.489,0 0.906,0.354 0.986,0.836 l 2,11.999 C 20.368,1.125 20.286,1.422 20.095,1.646 19.906,1.871 19.626,2 19.333,2 L -3.85,2 -4.89,8.166 C -4.97,8.639 -5.374,8.958 -5.833,8.98 -5.848,8.983 -5.86,9 -5.876,9 l -4.791,0 c -0.553,0 -1,-0.448 -1,-1 0,-0.552 0.447,-1 1,-1 l 3.945,0 2.903,-17.216 c -1.641,-0.493 -2.848,-2 -2.848,-3.8 0,-2.197 1.787,-3.984 3.984,-3.984 l 22,0 c 0.553,0 1,0.447 1,1 0,0.553 -0.447,1 -1,1"/></g><g transform="translate(17,5)" id="g28"><path id="path30" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(14,7)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.103,0 -2,-0.897 -2,-2 0,-1.103 0.897,-2 2,-2 1.103,0 2,0.897 2,2 0,1.103 -0.897,2 -2,2 m 0,-6 c -2.206,0 -4,1.794 -4,4 0,2.206 1.794,4 4,4 C 2.206,2 4,0.206 4,-2 4,-4.206 2.206,-6 0,-6"/></g><g transform="translate(31,5)" id="g36"><path id="path38" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3"/></g><g transform="translate(28,7)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.103,0 -2,-0.897 -2,-2 0,-1.103 0.897,-2 2,-2 1.103,0 2,0.897 2,2 0,1.103 -0.897,2 -2,2 m 0,-6 c -2.206,0 -4,1.794 -4,4 0,2.206 1.794,4 4,4 C 2.206,2 4,0.206 4,-2 4,-4.206 2.206,-6 0,-6"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CCD6DD" d="M31 22H11L9 10h24z"/><path fill="#66757F" d="M32.984 27h-22C9.89 27 9 26.109 9 25.016S9.906 23 11 23l.007-.001.008.001H31c.489 0 .906-.354.986-.836l2-12c.049-.29-.033-.586-.224-.811C33.573 9.129 33.294 9 33 9H9.817l-1.04-6.166c-.079-.473-.484-.792-.942-.814-.016-.003-.027-.02-.043-.02H3c-.552 0-1 .448-1 1s.448 1 1 1h3.946l2.903 17.216c-1.642.493-2.849 2-2.849 3.8C7 27.213 8.788 29 10.984 29h22c.553 0 1-.447 1-1s-.447-1-1-1zM30.82 17h-3.307l.273-2h3.366l-.332 2zm-5.326 0H22v-2h3.767l-.273 2zM20 17h-3.494l-.273-2H20v2zm-5.512 0h-3.307l-.333-2h3.367l.273 2zm-2.641 4l-.333-2h3.247l.273 2h-3.187zm5.206 0l-.273-2H20v2h-2.947zM22 21v-2h3.22l-.273 2H22zm4.967 0l.273-2h3.247l-.333 2h-3.187zm4.852-10l-.333 2H28.06l.273-2h3.486zm-5.505 0l-.273 2H22v-2h4.314zM20 11v2h-4.041l-.273-2H20zm-6.333 0l.273 2h-3.427l-.333-2h3.487z"/><circle fill="#E1E8ED" cx="14" cy="31" r="3"/><path fill="#292F33" d="M14 35c-2.206 0-4-1.794-4-4s1.794-4 4-4 4 1.794 4 4-1.794 4-4 4zm0-6c-1.103 0-2 .897-2 2s.897 2 2 2 2-.897 2-2-.897-2-2-2z"/><circle fill="#E1E8ED" cx="28" cy="31" r="3"/><path fill="#292F33" d="M28 35c-2.206 0-4-1.794-4-4s1.794-4 4-4 4 1.794 4 4-1.794 4-4 4zm0-6c-1.103 0-2 .897-2 2s.897 2 2 2 2-.897 2-2-.897-2-2-2z"/></svg> \ No newline at end of file |