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/1f698.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/1f698.svg')
-rw-r--r-- | public/emoji/1f698.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f698.svg b/public/emoji/1f698.svg index 9adc06efb..25d8df01d 100644 --- a/public/emoji/1f698.svg +++ b/public/emoji/1f698.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(34,3)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.895,-2 -2,-2 l -3,0 c -1.104,0 -2,0.895 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 3,0 C -0.895,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(9,3)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.105 -0.896,-2 -2,-2 l -3,0 c -1.104,0 -2,0.895 -2,2 l 0,8 c 0,1.105 0.896,2 2,2 l 3,0 C -0.896,10 0,9.105 0,8 L 0,0 Z"/></g><g transform="translate(9,31)" id="g28"><path id="path30" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 4,1 14,1 18,0 3.881,-0.97 5,-11 5,-11 0,0 2,0 2,-4 l 0,-8 c 0,0 -0.119,-3.03 -4,-4 -4,-1 -7,-1 -12,-1 -5,0 -8,0 -12,1 -3.88,0.97 -4,4 -4,4 l 0,8 c 0,0 0,4 2,4 0,0 1.12,10.03 5,11"/></g><g transform="translate(18,21)" id="g32"><path id="path34" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.905,0 8.623,-0.2 12,-0.561 L 11,5 C 10,8 4,8 0,8 -4,8 -10,8 -11,5 l -1,-5.561 C -8.623,-0.2 -3.905,0 0,0"/></g><g transform="translate(5,20.5)" id="g36"><path id="path38" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 -0.671,-1.5 -1.5,-1.5 l -2,0 c -0.829,0 -1.5,0.671 -1.5,1.5 0,0.829 0.671,1.5 1.5,1.5 l 2,0 C -0.671,1.5 0,0.829 0,0"/></g><g transform="translate(31,20.5)" id="g40"><path id="path42" style="fill:#3b88c3;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.829 0.672,-1.5 1.5,-1.5 l 2,0 C 4.328,-1.5 5,-0.829 5,0 5,0.829 4.328,1.5 3.5,1.5 l -2,0 C 0.672,1.5 0,0.829 0,0"/></g><g transform="translate(11,13)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -1,0 c -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 l 1,0 C -1.343,3 0,1.657 0,0"/></g><g transform="translate(32,13)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.344,-3 -3,-3 l -1,0 c -1.656,0 -3,1.343 -3,3 0,1.657 1.344,3 3,3 l 1,0 C -1.344,3 0,1.657 0,0"/></g><g transform="translate(12.001,14)" id="g52"><path id="path54" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.323,0 -0.64,0.156 -0.833,0.445 -2.575,3.059 -7.152,4.01 -7.198,4.02 -7.739,4.129 -8.09,4.656 -7.981,5.197 -7.872,5.738 -7.349,6.088 -6.805,5.98 -6.584,5.937 -1.374,4.861 0.831,1.555 1.137,1.095 1.013,0.475 0.554,0.168 0.383,0.055 0.19,0 0,0"/></g><g transform="translate(23.999,14)" id="g56"><path id="path58" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.19,0 -0.383,0.055 -0.554,0.168 -1.014,0.475 -1.138,1.095 -0.831,1.555 1.373,4.861 6.584,5.937 6.805,5.98 7.345,6.086 7.872,5.738 7.98,5.197 8.09,4.656 7.739,4.129 7.198,4.02 7.152,4.01 2.575,3.059 0.833,0.445 0.641,0.156 0.323,0 0,0"/></g><g transform="translate(18,7)" id="g60"><path id="path62" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -5.663,0 -12.639,0.225 -13.707,1.293 -0.391,0.391 -0.391,1.023 0,1.414 0.344,0.345 0.877,0.386 1.267,0.122 C -12.208,2.73 -10.155,2 0,2 c 10.155,0 12.208,0.73 12.44,0.829 0.391,0.264 0.922,0.223 1.267,-0.122 0.391,-0.391 0.391,-1.023 0,-1.414 C 12.639,0.225 5.663,0 0,0"/></g><g transform="translate(25,6.5)" id="g64"><path id="path66" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.5 -3.134,-2.5 -7,-2.5 -3.866,0 -7,1 -7,2.5 0,0.828 3.134,0.5 7,0.5 3.866,0 7,0.328 7,-0.5"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M34 33c0 1.104-.896 2-2 2h-3c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h3c1.104 0 2 .896 2 2v8zM9 33c0 1.104-.896 2-2 2H4c-1.104 0-2-.896-2-2v-8c0-1.104.896-2 2-2h3c1.104 0 2 .896 2 2v8z"/><path fill="#3B88C3" d="M9 5c4-1 14-1 18 0 3.881.97 5 11 5 11s2 0 2 4v8s-.119 3.03-4 4c-4 1-7 1-12 1s-8 0-12-1c-3.88-.97-4-4-4-4v-8s0-4 2-4C4 16 5.12 5.97 9 5z"/><path fill="#BBDDF5" d="M18 15c3.905 0 8.623.2 12 .561L29 10c-1-3-7-3-11-3S8 7 7 10l-1 5.561C9.377 15.2 14.095 15 18 15z"/><path fill="#3B88C3" d="M5 15.5c0 .829-.671 1.5-1.5 1.5h-2C.671 17 0 16.329 0 15.5S.671 14 1.5 14h2c.829 0 1.5.671 1.5 1.5zm26 0c0 .829.672 1.5 1.5 1.5h2c.828 0 1.5-.671 1.5-1.5s-.672-1.5-1.5-1.5h-2c-.828 0-1.5.671-1.5 1.5z"/><path fill="#FFCC4D" d="M11 23c0 1.657-1.343 3-3 3H7c-1.657 0-3-1.343-3-3s1.343-3 3-3h1c1.657 0 3 1.343 3 3zm21 0c0 1.657-1.344 3-3 3h-1c-1.656 0-3-1.343-3-3s1.344-3 3-3h1c1.656 0 3 1.343 3 3z"/><path fill="#269" d="M12.001 22c-.323 0-.64-.156-.833-.445-1.742-2.614-6.319-3.565-6.365-3.574-.541-.109-.892-.636-.783-1.178.109-.541.632-.891 1.176-.783.221.044 5.431 1.119 7.636 4.426.306.46.182 1.08-.277 1.387-.171.112-.364.167-.554.167zm11.998 0c-.19 0-.383-.055-.554-.168-.46-.307-.584-.927-.277-1.387 2.204-3.307 7.415-4.382 7.636-4.426.54-.106 1.067.242 1.176.783.109.542-.241 1.068-.782 1.178-.046.009-4.623.96-6.365 3.574-.193.29-.511.446-.834.446z"/><path fill="#55ACEE" d="M18 29c-5.663 0-12.639-.225-13.707-1.293-.391-.391-.391-1.023 0-1.414.344-.345.877-.386 1.267-.122.232.1 2.285.829 12.44.829s12.208-.729 12.44-.829c.391-.264.922-.223 1.267.122.391.391.391 1.023 0 1.414C30.639 28.775 23.663 29 18 29z"/><path fill="#269" d="M25 29.5c0 1.5-3.134 2.5-7 2.5s-7-1-7-2.5c0-.828 3.134-.5 7-.5s7-.328 7 .5z"/></svg> \ No newline at end of file |