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/1f6a3-1f3fb.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/1f6a3-1f3fb.svg')
-rw-r--r-- | public/emoji/1f6a3-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6a3-1f3fb.svg b/public/emoji/1f6a3-1f3fb.svg index 373293e11..85a692145 100644 --- a/public/emoji/1f6a3-1f3fb.svg +++ b/public/emoji/1f6a3-1f3fb.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(18.9883,22.1836)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.245,1.41 C 2.188,0.482 3.698,-0.082 4.204,0.244 4.76,0.597 6.12,-0.66 5.01,-1.37 3.899,-2.079 3.593,-1.363 2.699,-1.105 1.668,-0.809 1.09,-0.559 0,0"/></g><g transform="translate(19.9668,28.8755)" id="g24"><path id="path26" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.91,-0.201 -0.046,-0.961 0.236,-2.329 0.313,-1.515 -2.047,0 -1.825,-2.171 0.149,-1.464 -1.866,-1.973 -2.02,-0.507 -0.154,1.464 1.045,2.254 0.385,3.394 C -4.802,1.118 0,0 0,0"/></g><g transform="translate(15.3564,20.1255)" id="g28"><path id="path30" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 3.083,-1.158 1.927,-4.242 c 0,0 -4.549,1.004 -5.258,2.114 -0.709,1.11 0.601,2.729 0.601,2.729 L 0,0 Z"/></g><g transform="translate(19.9668,28.4502)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.808,-0.668 0.57,0.862 0,1.335 -0.806,0.667 -2.418,0.668 -3.224,0 -0.806,-0.667 -0.806,-2.003 0,-2.67 0.57,-0.472 0.806,-1.335 0.806,0 0,1.335 0.807,0 0.807,0.667 C -1.611,0 0,0 0,0"/></g><g transform="translate(2,19)" id="g36"><path id="path38" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 32,0 C 32,0 32,-2 31,-7 30.14,-11.302 9.999,-8 6.399,-7 3.316,-6.144 0,0 0,0"/></g><g transform="translate(35,18)" id="g40"><path id="path42" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -32,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><path id="path44" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,12 0,12 0,0 36,0 36,12 Z"/><g transform="translate(11.9995,9)" id="g46"><path id="path48" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 11.001,11 c 0.39,0.391 1.023,0.391 1.414,0 0.39,-0.391 0.39,-1.023 0,-1.414 L 0.707,0.293 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(10.9995,7)" id="g50"><path id="path52" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.512,0 -1.024,0.195 -1.414,0.586 -0.781,0.781 -0.781,2.047 0,2.828 l 3,3 c 0.78,0.781 2.048,0.781 2.828,0 0.781,-0.781 0.781,-2.047 0,-2.828 l -3,-3 C 1.024,0.195 0.512,0 0,0"/></g><g transform="translate(20.2334,23.5933)" id="g54"><path id="path56" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.563,0.683 -0.678,0.856 -1.159,1.589 -1.51,1.983 -2.246,2.144 -3.532,2.428 -5.157,1.836 -6.468,0.217 c -0.828,-1.024 -0.947,-2.175 -2.259,-3.794 0,0 4.2,-0.447 4.754,-0.093 0.556,0.354 0.758,1.266 0.96,2.175 0.2,0.91 0.671,1.255 1.04,0.709 0.24,-0.354 0.728,-0.624 0.728,-0.624 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M18.988 13.816l1.245-1.41c.942.928 2.453 1.492 2.959 1.166.556-.353 1.916.904.806 1.613-1.11.71-1.417-.007-2.31-.264-1.032-.296-1.61-.546-2.7-1.105zm.979-6.691c.91.201-.046.961.236 2.329.312 1.516-2.047 0-1.826 2.171.149 1.464-1.865 1.973-2.019.507-.154-1.464 1.045-2.254.385-3.394-1.578-2.731 3.224-1.613 3.224-1.613z"/><path d="M15.356 15.875l3.083 1.158-1.156 3.084s-4.55-1.004-5.259-2.113c-.709-1.111.602-2.729.602-2.729l2.73.6z"/><path fill="#292F33" d="M19.967 7.55c.808.668.57-.862 0-1.335-.806-.667-2.418-.668-3.224 0-.806.667-.806 2.003 0 2.67.57.472.806 1.335.806 0s.807 0 .807-.667c-.001-.668 1.611-.668 1.611-.668z"/><path fill="#C1694F" d="M2 17h32s0 2-1 7c-.86 4.302-21 1-24.601 0C5.316 23.144 2 17 2 17z"/><path fill="#F4900C" d="M35 18c0 .553-.447 1-1 1H2c-.552 0-1-.447-1-1 0-.553.448-1 1-1h32c.553 0 1 .447 1 1z"/><path fill="#55ACEE" d="M0 24h36v12H0z"/><path fill="#FFAC33" d="M12 27c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l11-11c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-11.001 11c-.195.195-.451.293-.706.293z"/><path fill="#FFCC4D" d="M11 29c-.512 0-1.024-.195-1.414-.586-.781-.781-.781-2.047 0-2.828l3-3c.78-.781 2.048-.781 2.828 0 .781.781.781 2.047 0 2.828l-3 3c-.391.391-.903.586-1.414.586z"/><path fill="#77B255" d="M20.233 12.407s-.563-.683-.678-.856c-.482-.732-.833-1.126-1.568-1.288-1.287-.284-2.912.308-4.222 1.927-.829 1.024-.947 2.174-2.259 3.794 0 0 4.199.447 4.754.092.556-.354.758-1.265.959-2.174.2-.91.671-1.255 1.04-.71.24.354.728.624.728.624l1.246-1.409z"/></svg> \ No newline at end of file |