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/1f1f1-1f1f8.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/1f1f1-1f1f8.svg')
-rw-r--r-- | public/emoji/1f1f1-1f1f8.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f1-1f1f8.svg b/public/emoji/1f1f1-1f1f8.svg index 437f875ba..ec06e4fcc 100644 --- a/public/emoji/1f1f1-1f1f8.svg +++ b/public/emoji/1f1f1-1f1f8.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,9)" id="g20"><path id="path22" style="fill:#009543;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,18 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><path id="path24" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 36,13 0,13 0,23 36,23 36,13 Z"/><g transform="translate(32,31)" id="g26"><path id="path28" style="fill:#00209f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -28,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 36,0 0,4 C 4,-1.791 2.209,0 0,0"/></g><g transform="translate(16.9063,20.2187)" id="g30"><path id="path32" style="fill:#292f33;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 0,0 c 0,0.594 0.26,1.138 0.753,1.312 l 0,-1.121 -0.487,-0.488 0.487,0 0,-0.727 c 0,-0.025 0.021,-0.041 0.027,-0.064 L 0.435,-1.546 C 0.23,-1.177 0,-0.564 0,0 m 2.188,0 c 0,-0.554 -0.222,-1.157 -0.424,-1.529 l -0.352,0.451 c 0.004,0.02 0.022,0.033 0.022,0.054 l 0,0.727 0.488,0 -0.488,0.488 0,1.121 C 1.928,1.138 2.188,0.594 2.188,0 M 4.293,-4.078 C 4.277,-4.031 3.867,-4.219 3.867,-4.219 l -1.846,2.362 c 0.226,0.405 0.49,1.073 0.49,1.904 0,1.241 -0.658,1.567 -1.077,1.654 l 0,0.055 c 0,0.172 -0.139,0.311 -0.311,0.311 l -0.059,0 C 0.893,2.067 0.753,1.928 0.753,1.756 l 0,-0.055 C 0.335,1.614 -0.323,1.288 -0.323,0.047 c 0,-0.848 0.275,-1.528 0.504,-1.93 l -1.759,-2.336 c 0,0 -0.359,0.188 -0.375,0.141 -0.016,-0.047 -0.75,-1.219 -0.75,-1.219 0,0 1.562,-1.02 3.797,-1.02 2,0 3.873,1.02 3.873,1.02 0,0 -0.659,1.172 -0.674,1.219"/></g><g transform="translate(20.7969,15.6562)" id="g34"><path id="path36" style="fill:#53646d;fill-opacity:1;fill-rule:evenodd;stroke:none" d="M 0,0 C 0,0 -1.422,-0.526 -2.797,-0.526 -4.172,-0.526 -5.594,0 -5.594,0 l -0.343,-0.649 c 0,0 1.453,-0.65 3.14,-0.65 1.688,0 3.141,0.65 3.141,0.65 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#009543" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#EEE" d="M0 13h36v10H0z"/><path fill="#00209F" d="M32 5H4C1.791 5 0 6.791 0 9v4h36V9c0-2.209-1.791-4-4-4z"/><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#292F33" d="M21.199 19.859c-.015-.047-.426.141-.426.141l-1.846-2.362c.226-.405.49-1.073.49-1.904 0-1.241-.658-1.567-1.077-1.654v-.055c0-.172-.139-.311-.311-.311h-.059c-.172 0-.311.139-.311.311v.056c-.419.087-1.076.413-1.076 1.654 0 .848.275 1.528.504 1.93L15.328 20s-.359-.188-.375-.141c-.016.047-.75 1.219-.75 1.219s1.562 1.02 3.797 1.02c2 0 3.873-1.02 3.873-1.02s-.658-1.172-.674-1.219zm-2.105-4.078c0 .554-.221 1.157-.424 1.529l-.352-.45c.004-.02.022-.033.022-.054v-.728h.488l-.488-.488v-1.121c.494.174.754.719.754 1.312zm-2.188 0c0-.594.26-1.138.753-1.312v1.121l-.488.488h.488v.728c0 .025.021.041.026.064l-.345.458c-.204-.37-.434-.982-.434-1.547z"/><path fill="#53646D" d="M20.797 20.344s-1.422.526-2.797.526-2.797-.526-2.797-.526l-.344.649s1.453.649 3.141.649 3.141-.649 3.141-.649l-.344-.649z"/></g></svg> \ No newline at end of file |