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/1f9e2.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/1f9e2.svg')
-rw-r--r-- | public/emoji/1f9e2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9e2.svg b/public/emoji/1f9e2.svg index 68e9079ff..c2dd6c6f2 100644 --- a/public/emoji/1f9e2.svg +++ b/public/emoji/1f9e2.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(22.8119,30.9138)" id="g20"><path id="path22" style="fill:#2b7bb9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.023,-0.521 -0.741,-0.913 -1.604,-0.875 -0.864,0.038 -1.545,0.491 -1.522,1.012 0.023,0.521 0.741,0.912 1.604,0.875 C -0.659,0.974 0.023,0.521 0,0"/></g><g transform="translate(29.8309,8.2602)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 3.523,-1.385 5.185,-0.089 5.31,1.082 1.874,1.947 1.874,1.947 L 0,0 Z"/></g><g transform="translate(7.5269,10.4513)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -5.256,-7.826 -6.757,-6.482 0,0 -0.426,1.397 1.23,4.218 C -3.871,0.557 0,0 0,0"/></g><g transform="translate(19.766,31.1801)" id="g32"><path id="path34" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -8.537,-0.43 -13.735,-16.348 7.495,0 16.785,-0.554 16.785,-0.554 0,0 7.799,-3.983 8.889,-4.469 1.089,-0.487 3.311,-1.637 3.311,-1.637 0,0 1.089,5.53 0.305,9.69 C 14.771,-9.159 11.024,-0.177 0,0"/></g><g transform="translate(3.3542,10.8333)" id="g36"><path id="path38" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.833,-3.042 -3.216,-5.821 -2.584,-6.864 0,0 -0.203,0.761 0.775,1.633 0.892,0.796 2.805,1.523 6.461,1.523 5.534,0 13.006,-4.498 16.119,-5.563 2.375,-0.812 2.875,-0.187 4.187,1.25 1.401,1.534 3.716,6.905 3.716,6.905 0,0 -7.469,4.107 -11.87,5.725 C 12.403,6.228 11.446,6.036 10.052,6.01 6.996,5.953 4.739,5.34 2.677,3.999 2.677,3.999 1.183,1.962 0,0"/></g><g transform="translate(30.5876,24.6609)" id="g40"><path id="path42" style="fill:#50a5e6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.61,3.443 -4.011,5.076 -4.011,5.076 -1.895,0.883 -4.158,1.449 -6.864,1.491 0,0 -12.192,0.105 -13.681,-16.395 0,0 2.541,1.115 7.919,0.792 7.299,-0.437 14.414,-4.117 15.987,-4.812 C 0.18,-11.068 0.717,-4.049 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><ellipse transform="rotate(-87.495 21.25 5.018)" fill="#2B7BB9" cx="21.249" cy="5.018" rx=".944" ry="1.565"/><path fill="#292F33" d="M29.831 27.74s3.523 1.385 5.185.088c.125-1.17-3.311-2.035-3.311-2.035l-1.874 1.947zM7.527 25.549S2.271 33.375.77 32.031c0 0-.425-1.397 1.23-4.218 1.656-2.822 5.527-2.264 5.527-2.264z"/><path fill="#1C6399" d="M19.766 4.82s-8.537.43-13.735 16.348c7.494 0 16.785.555 16.785.555s7.799 3.982 8.889 4.469c1.089.487 3.311 1.637 3.311 1.637s1.089-5.531.305-9.69S30.79 4.997 19.766 4.82z"/><path fill="#1C6399" d="M3.354 25.167C1.521 28.209.138 30.988.77 32.031c0 0-.203-.761.775-1.633.892-.795 2.805-1.522 6.461-1.522 5.534 0 13.006 4.498 16.119 5.562 2.375.812 2.875.188 4.188-1.25 1.4-1.534 3.716-6.904 3.716-6.904s-7.47-4.107-11.871-5.726-5.358-1.427-6.752-1.401c-3.056.057-5.314.671-7.375 2.011 0 0-1.494 2.036-2.677 3.999z"/><path fill="#50A5E6" d="M30.588 11.339c-.61-3.443-4.011-5.076-4.011-5.076-1.895-.883-4.158-1.448-6.864-1.491 0 0-12.192-.105-13.681 16.395 0 0 2.541-1.115 7.92-.793 7.299.438 14.414 4.117 15.986 4.812.83-2.779 1.367-9.798.65-13.847z"/></svg> \ No newline at end of file |