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/1f37c.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/1f37c.svg')
-rw-r--r-- | public/emoji/1f37c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f37c.svg b/public/emoji/1f37c.svg index 0f776fcb7..61f6c8ff2 100644 --- a/public/emoji/1f37c.svg +++ b/public/emoji/1f37c.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(33,28.7783)" id="g20"><path id="path22" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.414 0.717,0.707 1.424,1.414 2.84,2.828 3.552,4.95 2.138,6.364 0.723,7.778 -1.396,7.061 -2.811,5.646 -3.518,4.939 -2.808,4.222 -4.222,4.222 l -5.657,0 0.707,-0.698 c 0,0 3.536,-4.944 4.243,-4.236 -0.707,-0.708 4.232,-4.24 4.232,-4.24 L 0,-5.657 0,0 Z"/></g><g transform="translate(30.8994,21)" id="g24"><path id="path26" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.949,4.95 -4.95,4.949 c -0.707,-0.707 -4.243,0 -5.657,-1.414 -0.26,-0.26 -0.49,-0.49 -0.707,-0.707 L -18.385,5.657 -29.284,-5.242 c -1.562,-1.563 -1.562,-4.096 0,-5.657 l 8.485,-8.486 c 1.562,-1.561 4.095,-1.561 5.657,0 l 9.9,9.9 3.121,3.121 c 0.217,0.216 0.446,0.447 0.707,0.707 C 0,-4.242 -0.707,-0.707 0,0"/></g><g transform="translate(32.667,21.3535)" id="g28"><path id="path30" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.977,-0.977 -1.852,-1.684 -2.828,-0.707 l -9.193,9.192 c -0.976,0.977 -0.269,1.852 0.707,2.829 0.977,0.976 2.559,0.976 3.536,0 L 0,3.536 C 0.977,2.559 0.977,0.977 0,0"/></g><g transform="translate(13,4)" id="g32"><path id="path34" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 12,12.001 c 0.391,0.39 1.023,0.39 1.414,0 0.391,-0.391 0.391,-1.024 0,-1.415 l -12,-12 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(9,8)" id="g36"><path id="path38" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 12,12.001 c 0.391,0.39 1.023,0.39 1.414,0 0.391,-0.391 0.391,-1.024 0,-1.414 L 0.707,0.293 C 0.512,0.098 0.256,0 0,0"/></g><g transform="translate(5,12)" id="g40"><path id="path42" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.256,0 -0.512,0.098 -0.707,0.293 -0.391,0.391 -0.391,1.023 0,1.414 l 12,12.001 c 0.391,0.39 1.023,0.39 1.414,0 0.391,-0.391 0.391,-1.024 0,-1.414 L 0.707,0.293 C 0.512,0.098 0.256,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M33 7.222c0-1.414.717-.707 1.424-1.414 1.416-1.414 2.128-3.536.714-4.95-1.415-1.414-3.534-.697-4.948.717-.708.707.002 1.425-1.412 1.425h-5.657l.707.697s3.536 4.944 4.243 4.237c-.707.708 4.231 4.24 4.231 4.24l.698.705V7.222z"/><path fill="#CCD6DD" d="M30.899 15l-4.949-4.95L21 5.101c-.707.707-4.243 0-5.657 1.414l-.707.707-2.122 2.122L1.615 20.242c-1.562 1.562-1.562 4.096 0 5.657l8.485 8.485c1.562 1.562 4.095 1.562 5.657 0l9.9-9.899 3.121-3.121.707-.707c1.414-1.415.707-4.95 1.414-5.657z"/><path fill="#55ACEE" d="M32.667 14.646c-.977.977-1.852 1.684-2.828.707l-9.192-9.192c-.977-.977-.269-1.852.707-2.829.977-.976 2.559-.976 3.535 0l7.778 7.778c.977.977.977 2.56 0 3.536z"/><path fill="#99AAB5" d="M13 32c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l12-12c.391-.391 1.023-.391 1.414 0s.391 1.024 0 1.415l-12 12c-.195.194-.451.292-.707.292zm-4-4c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l12-12c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-12 12.001C9.512 27.902 9.256 28 9 28zm-4-4c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l12-12c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-12 12.001C5.512 23.902 5.256 24 5 24z"/></svg> \ No newline at end of file |