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/1f6bc.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/1f6bc.svg')
-rw-r--r-- | public/emoji/1f6bc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f6bc.svg b/public/emoji/1f6bc.svg index 8c6a12e03..300b10e45 100644 --- a/public/emoji/1f6bc.svg +++ b/public/emoji/1f6bc.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:#f4900c;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,28 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(14.4307,11.3086)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.513,0.06 -3.773,-0.47 -5.538,-2.686 -0.534,0.293 -1.202,0.316 -1.778,0.003 -0.898,-0.489 -1.23,-1.613 -0.741,-2.511 0.428,-0.785 1.31,-1.645 2.504,-1.698 0.039,-0.002 0.079,-0.003 0.119,-0.003 0.714,0 1.696,0.288 2.544,1.559 1.214,1.821 2.748,1.651 2.945,1.622 0.516,-0.099 1.022,0.032 1.42,0.319 C 0.917,-2.44 1.131,-0.955 0,0"/></g><g transform="translate(28.7178,8.6367)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.581,0.315 -1.255,0.293 -1.79,-0.005 -1.698,2.128 -3.849,2.691 -5.358,2.678 -1.155,-0.975 -0.911,-2.499 -1.513,-3.451 0.373,-0.229 0.822,-0.336 1.281,-0.265 0.173,0.028 1.724,0.218 2.949,-1.621 0.848,-1.272 1.831,-1.559 2.544,-1.559 0.041,0 0.08,10e-4 0.119,0.003 1.194,0.053 2.077,0.912 2.504,1.698 C 1.226,-1.624 0.898,-0.489 0,0"/></g><g transform="translate(28.0605,17.0605)" id="g32"><path id="path34" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.508,0.508 -1.291,0.576 -1.872,0.201 -2.012,0.238 -2.388,0.388 -3,1 c -2.031,2.031 -4.096,2.859 -5.466,3.199 1.348,0.451 2.455,1.456 3.086,2.759 0.742,0.09 1.319,0.715 1.319,1.481 0,0.56 -0.31,1.042 -0.764,1.3 -0.15,2.898 -2.433,5.2 -5.236,5.2 -2.802,0 -5.085,-2.302 -5.235,-5.2 -0.454,-0.258 -0.765,-0.74 -0.765,-1.3 0,-0.766 0.578,-1.391 1.32,-1.481 0.631,-1.303 1.739,-2.308 3.086,-2.759 C -13.025,3.859 -15.09,3.031 -17.121,1 -17.733,0.388 -18.109,0.238 -18.248,0.201 -18.831,0.576 -19.613,0.509 -20.121,0 c -0.586,-0.586 -0.586,-1.535 0,-2.121 0.047,-0.048 0.712,-0.691 1.83,-0.691 0.857,0 1.979,0.378 3.291,1.691 0.408,0.408 0.809,0.731 1.202,1.019 -0.119,-0.494 -0.185,-0.988 -0.185,-1.453 0,-2.422 1.756,-2.506 3.922,-2.506 2.166,0 3.923,0.084 3.923,2.506 0,0.465 -0.065,0.959 -0.185,1.453 0.393,-0.288 0.794,-0.611 1.202,-1.019 1.312,-1.313 2.435,-1.691 3.291,-1.691 1.117,0 1.782,0.643 1.83,0.691 0.586,0.586 0.586,1.535 0,2.121"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M14.431 24.691c-1.513-.06-3.773.47-5.538 2.686-.534-.294-1.203-.316-1.779-.004-.898.489-1.229 1.613-.74 2.512.428.785 1.31 1.645 2.504 1.697.039.002.079.003.119.003.713 0 1.696-.287 2.543-1.559 1.214-1.821 2.748-1.651 2.945-1.622.516.1 1.022-.032 1.42-.318-.557-.954-.344-2.44-1.474-3.395zm14.287 2.672c-.581-.315-1.255-.293-1.79.005-1.698-2.128-3.849-2.691-5.357-2.678-1.155.975-.911 2.499-1.514 3.451.373.229.822.336 1.281.265.173-.028 1.724-.218 2.949 1.621.848 1.271 1.831 1.559 2.544 1.559.041 0 .08-.001.119-.003 1.193-.053 2.076-.912 2.504-1.697.489-.899.162-2.033-.736-2.523zm-.658-8.423c-.508-.508-1.291-.576-1.872-.201-.14-.037-.516-.187-1.128-.799-2.031-2.031-4.096-2.859-5.466-3.199 1.348-.45 2.455-1.455 3.086-2.758.743-.091 1.32-.716 1.32-1.483 0-.56-.31-1.042-.765-1.3C23.086 6.303 20.803 4 18 4s-5.086 2.303-5.235 5.2c-.455.258-.765.74-.765 1.3 0 .767.577 1.392 1.319 1.482.631 1.303 1.739 2.308 3.087 2.758-1.371.34-3.436 1.168-5.466 3.199-.612.612-.988.762-1.127.799-.583-.374-1.365-.308-1.874.202-.586.586-.586 1.535 0 2.121.047.048.712.691 1.83.691.856 0 1.978-.378 3.291-1.691.408-.408.809-.731 1.202-1.019-.12.494-.186.988-.186 1.453C14.077 22.917 15.833 23 18 23c2.166 0 3.923-.083 3.923-2.506 0-.465-.065-.959-.186-1.453.394.288.794.611 1.202 1.019 1.312 1.314 2.434 1.691 3.291 1.691 1.117 0 1.782-.643 1.83-.691.586-.585.586-1.535 0-2.12z"/></svg> \ No newline at end of file |