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/1f6b6-1f3fb-200d-2640-fe0f.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/1f6b6-1f3fb-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f6b6-1f3fb-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6b6-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f6b6-1f3fb-200d-2640-fe0f.svg index 6680792c3..bad4c3fc5 100644 --- a/public/emoji/1f6b6-1f3fb-200d-2640-fe0f.svg +++ b/public/emoji/1f6b6-1f3fb-200d-2640-fe0f.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(15.3159,32.7393)" id="g20"><path id="path22" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.207,-0.267 1.054,-1.529 0.684,-2.739 -0.252,-0.838 0.225,0 1,0 0,0 0.627,-1.283 0.423,-3.226 C 1.9,-7.905 4.579,-8.581 4.784,-6.638 4.988,-4.697 3.399,-3.65 4.273,-2.138 6.365,1.481 0,0 0,0"/></g><g transform="translate(22,32)" id="g24"><path id="path26" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 -2.209,0 -4,1.791 -4,4 0,2.209 1.791,4 4,4 2.209,0 4,-1.791 4,-4"/></g><g transform="translate(26.2079,31.2339)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.037,0.051 -2.041,0.169 -3.756,2.378 -1.14,1.47 -2.205,2.412 -4.84,2.388 -2.798,-0.027 -5.141,-2.407 -3.346,-3.598 0.783,-0.519 1.44,-0.273 2.697,-0.625 C -7.27,-0.01 -6.97,-2.111 -5.186,-2.583 -1.693,-3.505 1.038,-0.051 0,0"/></g><g transform="translate(23.6956,15.0069)" id="g32"><path id="path34" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.553,0 -1,0.447 -1,1 0,4.52 -4.661,9.247 -4.708,9.294 -0.389,0.391 -0.389,1.024 0.002,1.414 0.391,0.39 1.023,0.389 1.413,-10e-4 C -4.077,11.491 1,6.352 1,1 1,0.447 0.553,0 0,0"/></g><g transform="translate(15.6956,1.0069)" id="g36"><path id="path38" style="fill:#2a6797;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.105,0 -2,0.896 -2,2 l 0,7 c 0,0.348 0.091,0.69 0.264,0.992 l 4,7 c 0.547,0.959 1.77,1.294 2.728,0.744 0.959,-0.548 1.292,-1.769 0.744,-2.728 L 2,8.469 2,2 C 2,0.896 1.104,0 0,0"/></g><g transform="translate(24.6966,4.0069)" id="g40"><path id="path42" style="fill:#4289c1;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.587,0 -1.168,0.257 -1.562,0.751 l -4,5 C -5.763,6 -5.899,6.294 -5.962,6.607 l -1,5 c -0.217,1.083 0.485,2.138 1.568,2.354 1.088,0.219 2.138,-0.486 2.354,-1.568 L -2.135,7.869 1.561,3.249 C 2.251,2.387 2.111,1.128 1.248,0.438 0.88,0.144 0.439,0 0,0"/></g><g transform="translate(22.6956,17.0069)" id="g44"><path id="path46" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0,-1 -2,-1 l -4,0 c -2,6 -0.359,12 2,12 3,0 3,-4 4,-9"/></g><g transform="translate(17.6956,24.0098)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.001,-0.045 -0.066,-4.552 -3.6,-7.203 l 0.01,-0.014 C -3.833,-7.399 -4,-7.676 -4,-8.003 c 0,-0.553 0.448,-1 1,-1 0.225,0 0.423,0.088 0.59,0.214 L -2.4,-8.803 C 1.95,-5.54 2,-0.228 2,-0.003 L 0,0 Z"/></g><g transform="translate(27.8774,4.9519)" id="g52"><path id="path54" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.271,0.271 0.16,0.676 -0.129,0.94 -0.592,1.363 -0.802,1.514 -0.802,1.514 -1.057,1.682 -1.675,1.931 -1.932,1.675 -3.805,-0.19 -5.236,-2.856 -5.288,-3.785 -5.319,-4.333 -4.643,-4.64 -4.259,-4.256 -3.126,-3.123 -0.982,-0.981 0,0"/></g><g transform="translate(17.6114,0.097)" id="g56"><path id="path58" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.383,-0.003 0.594,0.361 0.578,0.753 0.554,1.379 0.514,1.634 0.514,1.634 0.455,1.934 0.199,2.549 -0.165,2.552 -2.807,2.575 -5.711,1.721 -6.408,1.106 -6.82,0.742 -6.564,0.046 -6.021,0.042 -4.418,0.032 -1.388,0.01 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M15.316 3.261C14.109 3.528 16.37 4.79 16 6c-.252.838.225 0 1 0 0 0 .627 1.283.423 3.226-.207 1.94 2.472 2.616 2.677.673.204-1.941-1.385-2.988-.511-4.5 2.092-3.619-4.273-2.138-4.273-2.138"/><path fill="#F7DECE" d="M22 4c0 2.209-1.791 4-4 4s-4-1.791-4-4 1.791-4 4-4 4 1.791 4 4"/><path fill="#292F33" d="M26.208 4.766c-1.037-.051-2.041-.169-3.756-2.378-1.14-1.469-2.205-2.412-4.84-2.387-2.798.026-5.141 2.407-3.346 3.598.783.52 1.44.273 2.698.625 1.975.553 2.274 2.654 4.059 3.125 3.491.922 6.222-2.532 5.185-2.583z"/><path fill="#EEC2AD" d="M23.696 20.993c-.553 0-1-.447-1-1 0-4.519-4.661-9.247-4.708-9.294-.39-.391-.389-1.024.001-1.414.391-.39 1.024-.389 1.413 0 .216.216 5.293 5.355 5.293 10.708.001.553-.447 1-.999 1z"/><path fill="#2A6797" d="M15.696 34.993c-1.104 0-2-.896-2-2v-7c0-.348.091-.69.264-.992l4-7c.548-.958 1.771-1.293 2.728-.744.959.548 1.292 1.769.744 2.729l-3.736 6.539v6.469c0 1.104-.896 1.999-2 1.999z"/><path fill="#4289C1" d="M24.697 31.993c-.587 0-1.168-.257-1.562-.751l-4-5c-.2-.249-.337-.543-.399-.856l-1-5c-.217-1.083.485-2.137 1.568-2.353 1.088-.219 2.138.486 2.354 1.568l.905 4.523 3.695 4.62c.69.862.551 2.121-.312 2.811-.37.295-.811.438-1.249.438z"/><path fill="#9268CA" d="M22.696 18.993s0 1-2 1h-4c-2-6-.359-12 2-12 3 0 3 4 4 9"/><path fill="#F7DECE" d="M17.696 11.99c0 .045-.066 4.552-3.6 7.203l.01.014c-.243.183-.41.459-.41.786 0 .553.448 1 1 1 .225 0 .423-.088.59-.214l.01.014c4.35-3.262 4.4-8.575 4.4-8.8l-2-.003z"/><path fill="#292F33" d="M27.877 31.048c.271-.271.16-.676-.129-.94-.463-.422-.672-.574-.672-.574-.255-.168-.873-.418-1.13-.161-1.872 1.865-3.304 4.53-3.356 5.459-.031.548.645.855 1.029.471l4.258-4.255zm-10.266 4.855c.383.003.594-.361.578-.753-.025-.626-.064-.882-.064-.882-.059-.3-.316-.915-.68-.918-2.642-.023-5.545.83-6.243 1.446-.412.363-.156 1.06.388 1.063l6.021.044z"/></svg> \ No newline at end of file |