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/1f3db.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/1f3db.svg')
-rw-r--r-- | public/emoji/1f3db.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3db.svg b/public/emoji/1f3db.svg index 85a798427..bdd0d45f4 100644 --- a/public/emoji/1f3db.svg +++ b/public/emoji/1f3db.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="clipPath18" clipPathUnits="userSpaceOnUse"><path id="path20" 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"><path id="path12" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 29,7 7,7 7,25 29,25 29,7 Z"/><g id="g14"><g clip-path="url(#clipPath18)" id="g16"><g transform="translate(8,7)" id="g22"><path id="path24" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.597,-2 -1.333,-2 l -1.334,0 C -3.403,-2 -4,-1.104 -4,0 l 0,18 c 0,1.105 0.597,2 1.333,2 l 1.334,0 C -0.597,20 0,19.105 0,18 L 0,0 Z"/></g><g transform="translate(32,7)" id="g26"><path id="path28" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.597,-2 -1.333,-2 l -1.334,0 C -3.403,-2 -4,-1.104 -4,0 l 0,18 c 0,1.105 0.597,2 1.333,2 l 1.334,0 C -0.597,20 0,19.105 0,18 L 0,0 Z"/></g><g transform="translate(16,7)" id="g30"><path id="path32" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.597,-2 -1.333,-2 l -1.334,0 C -3.403,-2 -4,-1.104 -4,0 l 0,18 c 0,1.105 0.597,2 1.333,2 l 1.334,0 C -0.597,20 0,19.105 0,18 L 0,0 Z"/></g><g transform="translate(24,7)" id="g34"><path id="path36" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.598,-2 -1.334,-2 l -1.332,0 C -3.402,-2 -4,-1.104 -4,0 l 0,18 c 0,1.105 0.598,2 1.334,2 l 1.332,0 C -0.598,20 0,19.105 0,18 L 0,0 Z"/></g><g transform="translate(33,6)" id="g38"><path id="path40" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -26,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 L -2,2 C -0.895,2 0,1.104 0,0"/></g><g transform="translate(35,4)" id="g42"><path id="path44" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.104 -0.895,-2 -2,-2 l -30,0 c -1.104,0 -2,0.896 -2,2 0,1.104 0.896,2 2,2 L -2,2 C -0.895,2 0,1.104 0,0"/></g><g transform="translate(36,2.5)" id="g46"><path id="path48" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.828 -0.672,-1.5 -1.5,-1.5 l -33,0 c -0.829,0 -1.5,0.672 -1.5,1.5 0,0.828 0.671,1.5 1.5,1.5 l 33,0 C -0.672,1.5 0,0.828 0,0"/></g><g transform="translate(33,26)" id="g50"><path id="path52" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,1.104 -0.956,2 -2.133,2 L -28,2 c -1.179,0 -2,-0.896 -2,-2 0,-0.751 0.386,-1.398 1,-1.74 l 0,-1.26 4,0 0,1 4,0 0,-1 4,0 0,1 4,0 0,-1 4,0 0,1 4,0 0,-1 4,0 0,1.312 C -0.401,-1.334 0,-0.713 0,0"/></g><g transform="translate(2,27.5562)" id="g54"><path id="path56" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,1.031 1.012,1.444 1.012,1.444 l 14.904,7 15.047,-7 c 0,0 1.037,-0.232 1.037,-1.45 l 0,-0.55 -32,0 L 0,0 Z"/></g><g transform="translate(18,33.4585)" id="g58"><path id="path60" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -10.319,-4.865 -11.35,-5.302 -1.031,-0.438 -0.686,-1.156 10e-4,-1.156 l 22.646,0 c 1.062,0 0.812,0.812 -0.031,1.25 C 10.422,-4.771 0,0 0,0"/></g><g transform="translate(34,27)" id="g62"><path id="path64" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.552 -0.447,-1 -1,-1 l -30,0 c -0.552,0 -1,0.448 -1,1 0,0.552 0.448,1 1,1 L -1,0.994 C -0.447,0.994 0,0.552 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M7 11h22v18H7z"/><path fill="#CCD6DD" d="M8 29c0 1.104-.597 2-1.333 2H5.333C4.597 31 4 30.104 4 29V11c0-1.104.597-2 1.333-2h1.333C7.403 9 8 9.896 8 11v18zm24 0c0 1.104-.597 2-1.333 2h-1.334C28.597 31 28 30.104 28 29V11c0-1.104.597-2 1.333-2h1.334C31.403 9 32 9.896 32 11v18zm-16 0c0 1.104-.597 2-1.333 2h-1.333C12.597 31 12 30.104 12 29V11c0-1.104.597-2 1.333-2h1.333C15.403 9 16 9.896 16 11v18zm8 0c0 1.104-.598 2-1.334 2h-1.332C20.598 31 20 30.104 20 29V11c0-1.104.598-2 1.334-2h1.332C23.402 9 24 9.896 24 11v18z"/><path fill="#9AAAB4" d="M33 30c0 1.104-.896 2-2 2H5c-1.104 0-2-.896-2-2s.896-2 2-2h26c1.104 0 2 .896 2 2z"/><path fill="#CCD6DD" d="M35 32c0 1.104-.896 2-2 2H3c-1.104 0-2-.896-2-2s.896-2 2-2h30c1.104 0 2 .896 2 2z"/><path fill="#E1E8ED" d="M36 33.5c0 .828-.672 1.5-1.5 1.5h-33C.671 35 0 34.328 0 33.5S.671 32 1.5 32h33c.828 0 1.5.672 1.5 1.5z"/><path fill="#9AAAB4" d="M33 10c0-1.104-.956-2-2.133-2H5c-1.179 0-2 .896-2 2 0 .751.386 1.398 1 1.74V13h4v-1h4v1h4v-1h4v1h4v-1h4v1h4v-1.312c.599-.354 1-.975 1-1.688z"/><path fill="#CCD6DD" d="M2 8.444C2 7.413 3.012 7 3.012 7l14.904-7 15.047 7S34 7.231 34 8.45V9H2v-.556z"/><path fill="#9AAAB4" d="M18 2.542S7.681 7.407 6.65 7.844C5.619 8.281 5.964 9 6.651 9h22.646c1.062 0 .812-.812-.031-1.25C28.422 7.312 18 2.542 18 2.542z"/><path fill="#CCD6DD" d="M34 9c0 .552-.447 1-1 1H3c-.552 0-1-.448-1-1s.448-1 1-1l30 .006c.553 0 1 .442 1 .994z"/></svg> \ No newline at end of file |