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/1f1f4-1f1f2.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/1f1f4-1f1f2.svg')
-rw-r--r-- | public/emoji/1f1f4-1f1f2.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f4-1f1f2.svg b/public/emoji/1f1f4-1f1f2.svg index 95682a7be..29af82589 100644 --- a/public/emoji/1f1f4-1f1f2.svg +++ b/public/emoji/1f1f4-1f1f2.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(0,9)" id="g20"><path id="path22" style="fill:#008000;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 36,4 0,4 0,0 Z"/></g><g transform="translate(32,31)" id="g24"><path id="path26" style="fill:#eeeeee;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(36,23)" id="g28"><path id="path30" style="fill:#db161b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -27,0 0,8 -5,0 c -2.209,0 -4,-1.791 -4,-4 l 0,-4 0,-10 0,-4 c 0,-2.209 1.791,-4 4,-4 l 5,0 0,8 27,0 0,10 z"/></g><g transform="translate(3.625,27.5469)" id="g32"><path id="path34" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.312,-0.567 0.313,-0.789 0.222,-0.838 -0.09,-0.051 -0.238,0.09 -0.55,0.656 C -0.641,0.385 -1,1.164 -0.91,1.213 -0.819,1.264 -0.312,0.566 0,0"/></g><g transform="translate(5.5156,27.8955)" id="g36"><path id="path38" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.312,-0.567 -0.493,-1.067 -0.402,-1.117 0.09,-0.05 0.418,0.369 0.73,0.935 C 0.641,0.385 0.821,0.885 0.73,0.935 0.64,0.985 0.312,0.566 0,0"/></g><g transform="translate(4.9531,26.9844)" id="g40"><path id="path42" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.297,1.422 -0.028,0.005 c 0.103,0.049 0.184,0.127 0.184,0.237 0,0.16 -0.147,0.289 -0.328,0.289 -0.181,0 -0.328,-0.129 -0.328,-0.289 0,-0.108 0.075,-0.193 0.175,-0.243 L -0.906,-0.016 0,0 Z"/></g><g transform="translate(6.7031,24.2344)" id="g44"><path id="path46" style="fill:#eeeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.271,0.226 -1.349,1.159 -1.861,1.716 0.047,0.16 0.074,0.332 0.063,0.515 l 0.017,0 0,-0.007 0.89,0 0,-0.172 1.094,0 0,0.531 -1.094,0 0,-0.172 -0.89,0 0,-0.008 -0.031,0 0,0.269 -0.813,0 0,-0.269 -0.328,0 0,-0.015 -0.641,0 0,0.218 -1.031,0 0,-0.578 1.031,0 0,0.219 0.641,0 0,-0.016 0.276,0 -0.036,-0.375 c 0,0 -1.039,-0.046 -1.318,-0.09 -0.688,-0.11 -0.469,-0.313 0.093,-0.5 0.26,-0.087 0.518,-0.12 0.762,-0.133 -0.398,-0.424 -1.208,-1.053 -1.402,-1.164 -0.219,-0.125 -0.219,-0.281 0.203,-0.188 0.409,0.091 1.355,0.927 1.684,1.348 0.1,0.004 0.197,0.008 0.285,0.012 0.15,0.005 0.268,0.099 0.369,0.224 0.427,-0.506 1.263,-1.254 1.6,-1.459 C -0.078,-0.312 0.09,-0.308 0.217,-0.287 0.344,-0.266 0.281,-0.234 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="green" d="M8 31h24c2.209 0 4-1.791 4-4v-4H8v8z"/><path fill="#EEE" d="M32 5H8v8h28V9c0-2.209-1.791-4-4-4z"/><path fill="#DB161B" d="M36 13H9V5H4C1.791 5 0 6.791 0 9v18c0 2.209 1.791 4 4 4h5v-8h27V13z"/><g fill="#EEE"><path d="M3.625 8.453c.313.567.313.789.222.839-.09.05-.238-.09-.55-.657-.313-.567-.672-1.345-.582-1.395.091-.051.597.647.91 1.213zm1.891-.349c-.313.567-.493 1.067-.402 1.117.09.05.417-.369.73-.935.312-.567.493-1.067.402-1.117-.091-.05-.418.369-.73.935zm-.563.912l-.297-1.422-.028-.006c.103-.049.184-.126.184-.237 0-.16-.147-.289-.328-.289s-.328.13-.328.29c0 .108.075.193.175.243l-.284 1.436.906-.015z"/><path d="M6.703 11.766c-.271-.226-1.349-1.159-1.861-1.716.046-.16.073-.332.062-.516h.017v.008h.891v.172h1.094v-.531H5.812v.172h-.89v.008h-.031v-.269h-.813v.269H3.75v.016h-.641v-.22H2.078v.578h1.031v-.218h.641v.016h.276l-.036.374s-1.039.046-1.318.091c-.688.109-.469.312.094.5.259.086.517.12.761.133-.397.424-1.207 1.053-1.402 1.164-.219.125-.219.281.203.188.409-.091 1.355-.926 1.684-1.348l.285-.012c.15-.006.269-.1.369-.224.427.505 1.264 1.254 1.6 1.458.359.219.527.214.654.193.127-.021.064-.052-.217-.286z"/></g></svg> \ No newline at end of file |