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/1f4c5.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/1f4c5.svg')
-rw-r--r-- | public/emoji/1f4c5.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4c5.svg b/public/emoji/1f4c5.svg index 2defa9405..ca68a82a6 100644 --- a/public/emoji/1f4c5.svg +++ b/public/emoji/1f4c5.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:#e0e7ec;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,23 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(34,36)" id="g24"><path id="path26" style="fill:#dd2f45;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.277,0 C -3.105,-0.295 -3,-0.634 -3,-1 c 0,-1.104 -0.895,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,0.366 0.105,0.705 0.277,1 l -18.554,0 c 0.172,-0.295 0.277,-0.634 0.277,-1 0,-1.104 -0.896,-2 -2,-2 -1.104,0 -2,0.896 -2,2 0,0.366 0.105,0.705 0.277,1 L -32,0 c -1.104,0 -2,-0.896 -2,-2 l 0,-11 36,0 0,11 C 2,-0.896 1.105,0 0,0"/></g><g transform="translate(23.6875,17)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.5,0 c -1.085,0 -1.538,0.731 -1.538,1.5 0,0.792 0.566,1.5 1.538,1.5 L 1.515,3 C 2.487,3 3.03,2.299 3.03,1.395 l 0,-12.865 c 0,-1.13 -0.558,-1.762 -1.53,-1.762 -0.972,0 -1.5,0.632 -1.5,1.762 L 0,0 Z"/></g><g transform="translate(32,26)" id="g32"><path id="path34" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(32,29)" id="g36"><path id="path38" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(29,26)" id="g40"><path id="path42" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(29,29)" id="g44"><path id="path46" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(26,26)" id="g48"><path id="path50" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(26,29)" id="g52"><path id="path54" style="fill:#f3aab9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.552 0.447,-1 1,-1 1.553,-1 2,-0.552 2,0 2,0.552 1.553,1 1,1 0.447,1 0,0.552 0,0"/></g><g transform="translate(2.4683,31.0596)" id="g56"><path id="path58" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.437 0.346,0.783 0.783,0.783 l 0.173,0 c 0.335,0 0.568,-0.173 0.711,-0.407 l 1.89,-3.079 1.901,3.089 C 5.62,0.65 5.843,0.783 6.159,0.783 l 0.172,0 C 6.768,0.783 7.114,0.437 7.114,0 l 0,-5.65 c 0,-0.437 -0.346,-0.783 -0.783,-0.783 -0.427,0 -0.772,0.356 -0.772,0.783 l 0,3.546 -1.372,-2.113 c -0.163,-0.244 -0.366,-0.396 -0.65,-0.396 -0.285,0 -0.488,0.152 -0.651,0.396 l -1.351,2.083 0,-3.536 C 1.535,-6.097 1.189,-6.433 0.762,-6.433 0.335,-6.433 0,-6.097 0,-5.67 L 0,0 Z"/></g><g transform="translate(14.7905,27.6655)" id="g60"><path id="path62" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.985,2.348 -1.971,0 0,0 Z m -4.4,-1.972 2.48,5.6 c 0.172,0.386 0.487,0.62 0.914,0.62 l 0.091,0 c 0.427,0 0.732,-0.234 0.905,-0.62 l 2.48,-5.6 c 0.051,-0.111 0.081,-0.213 0.081,-0.315 0,-0.416 -0.325,-0.752 -0.742,-0.752 -0.366,0 -0.61,0.214 -0.752,0.539 l -0.477,1.118 -3.131,0 -0.497,-1.169 c -0.133,-0.304 -0.397,-0.488 -0.722,-0.488 -0.407,0 -0.722,0.326 -0.722,0.732 0,0.112 0.041,0.224 0.092,0.335"/></g><g transform="translate(21.2188,28.3462)" id="g64"><path id="path66" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.762,0 1.199,0.407 1.199,1.006 l 0,0.021 c 0,0.67 -0.468,1.016 -1.23,1.016 l -1.555,0 L -1.586,0 0,0 Z m -3.151,2.673 c 0,0.437 0.346,0.783 0.783,0.783 l 2.47,0 c 0.904,0 1.605,-0.255 2.072,-0.722 0.396,-0.397 0.61,-0.955 0.61,-1.626 l 0,-0.021 c 0,-1.117 -0.558,-1.808 -1.423,-2.164 l 1.087,-1.321 c 0.154,-0.193 0.255,-0.356 0.255,-0.6 0,-0.437 -0.366,-0.721 -0.742,-0.721 -0.356,0 -0.59,0.173 -0.773,0.406 l -1.524,1.931 -1.25,0 0,-1.555 c 0,-0.437 -0.346,-0.782 -0.782,-0.782 -0.437,0 -0.783,0.345 -0.783,0.782 l 0,5.61 z"/></g><g transform="translate(8.7992,7.1912)" id="g68"><path id="path70" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 4.542,3.721 c 1.986,1.62 2.762,2.511 2.762,3.835 0,1.346 -0.89,2.077 -2.145,2.077 C 4.154,9.633 3.447,9.198 2.557,8.24 2.328,7.989 1.918,7.738 1.37,7.738 c -0.891,0 -1.598,0.708 -1.598,1.597 0,0.389 0.16,0.8 0.411,1.096 1.278,1.484 2.785,2.351 5.204,2.351 3.31,0 5.501,-1.94 5.501,-4.93 l 0,-0.046 c 0,-2.67 -1.37,-3.994 -4.2,-6.185 l -2.602,-2.008 5.569,0 c 0.845,0 1.53,-0.685 1.53,-1.53 0,-0.844 -0.685,-1.507 -1.53,-1.507 l -8.673,0 c -1.096,0 -1.895,0.617 -1.895,1.667 0,0.685 0.32,1.278 0.913,1.757"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E0E7EC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v23z"/><path fill="#DD2F45" d="M34 0h-3.277c.172.295.277.634.277 1 0 1.104-.896 2-2 2s-2-.896-2-2c0-.366.105-.705.277-1H8.723C8.895.295 9 .634 9 1c0 1.104-.896 2-2 2s-2-.896-2-2c0-.366.105-.705.277-1H2C.896 0 0 .896 0 2v11h36V2c0-1.104-.896-2-2-2z"/><path fill="#66757F" d="M23.688 19h-.5c-1.085 0-1.538-.731-1.538-1.5 0-.792.565-1.5 1.538-1.5h2.015c.972 0 1.515.701 1.515 1.605V30.47c0 1.13-.558 1.763-1.53 1.763s-1.5-.633-1.5-1.763V19z"/><g fill="#F3AAB9"><circle cx="33" cy="10" r="1"/><circle cx="33" cy="7" r="1"/><circle cx="30" cy="10" r="1"/><circle cx="30" cy="7" r="1"/><circle cx="27" cy="10" r="1"/><circle cx="27" cy="7" r="1"/></g><path d="M2.468 4.94c0-.437.346-.783.783-.783h.173c.335 0 .569.173.711.406l1.891 3.08 1.9-3.089c.162-.264.386-.396.701-.396h.172c.437 0 .783.346.783.783v5.65c0 .437-.346.783-.783.783-.427 0-.772-.356-.772-.783V7.044L6.655 9.158c-.162.243-.365.396-.65.396s-.488-.152-.65-.396L4.003 7.074v3.537c0 .427-.346.762-.772.762s-.762-.335-.762-.762V4.94zm7.923 5.366l2.479-5.6c.173-.386.488-.62.915-.62h.091c.427 0 .732.234.905.62l2.479 5.6c.051.111.081.213.081.315 0 .417-.325.752-.742.752-.366 0-.61-.213-.752-.539l-.477-1.118h-3.13l-.498 1.169c-.132.305-.396.488-.722.488-.407 0-.722-.325-.722-.732.001-.112.042-.224.093-.335zm4.4-1.972l-.985-2.348-.986 2.348h1.971zm3.277-3.353c0-.437.346-.783.783-.783h2.47c.904 0 1.605.254 2.072.722.396.396.61.955.61 1.626v.021c0 1.118-.559 1.809-1.423 2.165l1.087 1.321c.153.193.255.356.255.6 0 .437-.366.722-.742.722-.355 0-.59-.173-.772-.407l-1.524-1.931h-1.25v1.555c0 .437-.346.783-.782.783-.437 0-.783-.346-.783-.783V4.981zm3.151 2.673c.762 0 1.199-.407 1.199-1.006v-.021c0-.67-.468-1.016-1.23-1.016h-1.555v2.043h1.586z" fill="#FFF"/><path fill="#66757F" d="M8.799 28.809l4.542-3.721c1.986-1.62 2.762-2.511 2.762-3.835 0-1.346-.89-2.077-2.145-2.077-1.004 0-1.712.434-2.602 1.392-.228.251-.639.503-1.187.503-.89 0-1.598-.708-1.598-1.598 0-.388.16-.799.411-1.096 1.278-1.484 2.785-2.351 5.204-2.351 3.31 0 5.501 1.94 5.501 4.93v.046c0 2.67-1.369 3.994-4.2 6.185l-2.602 2.009h5.569c.845 0 1.53.685 1.53 1.529 0 .844-.685 1.507-1.53 1.507H9.781c-1.096 0-1.895-.616-1.895-1.666 0-.685.32-1.278.913-1.757z"/></svg> \ No newline at end of file |