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/1f3da.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/1f3da.svg')
-rw-r--r-- | public/emoji/1f3da.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3da.svg b/public/emoji/1f3da.svg index df78c98e8..5c5ade6ba 100644 --- a/public/emoji/1f3da.svg +++ b/public/emoji/1f3da.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="clipPath24" clipPathUnits="userSpaceOnUse"><path id="path26" 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 transform="translate(25.0352,23.9648)" id="g12"><path id="path14" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.41,-1.506 0.167,3.749 -4.792,4.792 -13,-13 0,-16 26,0 0,16 L 0,0 Z"/></g><path id="path16" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 5,2 6,2 6,18 5,18 5,2 Z"/><path id="path18" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 30,2 1,0 0,16 -1,0 0,-16 z"/><g id="g20"><g clip-path="url(#clipPath24)" id="g22"><g transform="translate(31.707,18.707)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5.802,5.802 -1.74,-1.088 6.128,-6.128 c 0.195,-0.195 0.451,-0.293 0.707,-0.293 0.256,0 0.512,0.098 0.707,0.293 0.391,0.391 0.391,1.023 0,1.414"/></g><g transform="translate(22.8525,27.5615)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.146,4.146 c -0.39,0.39 -1.023,0.39 -1.414,0 l -13,-13.001 c -0.39,-0.39 -0.39,-1.023 0,-1.414 0.391,-0.39 1.024,-0.39 1.415,0 L -4.853,2.024 -0.12,-2.708 0,0 Z"/></g><path id="path36" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,2 -4,0 0,8 4,0 0,-8 z"/><path id="path38" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13,14 -4,0 0,4 4,0 0,-4 z"/><path id="path40" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 20,14 -4,0 0,4 4,0 0,-4 z"/><path id="path42" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13,6 -4,0 0,4 4,0 0,-4 z"/><path id="path44" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 27,6 -4,0 0,4 4,0 0,-4 z"/><g transform="translate(33,1)" id="g46"><path id="path48" style="fill:#bcbec0;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 l -28,0 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 L -1,1 C -0.447,1 0,0.553 0,0"/></g><g transform="translate(24.4199,23.5801)" id="g50"><path id="path52" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.795,-1.122 0.125,2.792 -1.75,1.75 -1,-6 3,-2 -2,-9 6,7 -1,5 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#662113" d="M9.294 7.969l.55-.372v-.395c0-.276-.224-.5-.5-.5h-2c-.276 0-.5.224-.5.5V9.07l.632.428-.632.427v4.277h3V8.341l-.55-.372z"/><path fill="#D99E82" d="M31 21v-5l-5.965-5.965-2.41 1.507.167-3.75L18 3 5 16v7h2v1H5v9h26v-5.5h-1v-1h1V22h-2v-1z"/><path fill="#C1694F" d="M10 26h4v6h-4zm0-9h4v4h-4zm12.5 9h4v4h-4z"/><path fill="#BCBEC0" d="M33.5 33.5c0 .828-.672 1.5-1.5 1.5H4c-.828 0-1.5-.672-1.5-1.5S3.172 32 4 32h28c.828 0 1.5.672 1.5 1.5z"/><path d="M31.707 15.293l-5.802-5.802-1.74 1.088 6.128 6.128c.195.195.451.293.707.293s.512-.098.707-.293c.391-.391.391-1.023 0-1.414zm-8.854-8.855l-4.146-4.146c-.391-.391-1.023-.391-1.414 0l-13 13c-.391.391-.391 1.023 0 1.414s1.023.391 1.414 0L18 4.414l4.732 4.732.121-2.708z" fill="#292F33"/><path fill="#662113" d="M24.42 10.42l-1.795 1.122.125-2.792-1.979-1.979-1.625 7.417 3.687 1.729-2.75 7.666L27 17l-1-5zM8.997 18.918l5.58-1.722.428 1.389-5.58 1.721zm-.318 10.848l5.753-2.952.664 1.293-5.754 2.952zm18.489-.274l-5.58-1.722.429-1.388 5.58 1.721z"/><path fill="#662113" d="M14.728 31.046l-5.99-2.705.597-1.324 5.99 2.704z"/></svg> \ No newline at end of file |