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/23f0.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/23f0.svg')
-rw-r--r-- | public/emoji/23f0.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/23f0.svg b/public/emoji/23f0.svg index 5c9c6c9f7..ea9ad1431 100644 --- a/public/emoji/23f0.svg +++ b/public/emoji/23f0.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(20,29.9585)" id="g20"><path id="path22" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.112 -0.903,-2.014 -2,-2.014 -1.097,0 -2,0.902 -2,2.014 l 0,4.028 c 0,1.112 0.903,2.014 2,2.014 1.097,0 2,-0.902 2,-2.014 L 0,0 Z"/></g><g transform="translate(9.1797,0)" id="g24"><path id="path26" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.224,0 -0.452,0.052 -0.666,0.159 -1.402,0.533 -1.7,1.439 -1.332,2.186 l 8.94,18.128 c 0.253,0.511 0.769,0.834 1.333,0.834 0.565,0 1.081,-0.323 1.332,-0.834 L 19.215,2.186 C 19.583,1.439 19.285,0.533 18.549,0.159 17.813,-0.213 16.918,0.089 16.55,0.835 L 8.941,16.26 1.334,0.835 C 1.073,0.306 0.546,0 0,0"/></g><g transform="translate(18.1211,15.6084)" id="g28"><path id="path30" style="fill:#58595b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.263,0 -0.516,0.106 -0.702,0.295 l -13.907,14.099 c -0.388,0.394 -0.388,1.031 0,1.424 0.388,0.393 1.017,0.393 1.404,0 L 0,2.432 13.203,15.818 c 0.389,0.393 1.017,0.393 1.405,0 0.388,-0.393 0.388,-1.03 0,-1.424 L 0.703,0.295 C 0.516,0.106 0.264,0 0,0"/></g><g transform="translate(34.0146,16.6152)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-8.898 -7.115,-16.111 -15.894,-16.111 -8.777,0 -15.893,7.213 -15.893,16.111 0,8.9 7.116,16.113 15.893,16.113 C -7.115,16.113 0,8.9 0,0"/></g><g transform="translate(30.041,16.6152)" id="g36"><path id="path38" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-6.674 -5.335,-12.084 -11.92,-12.084 -6.583,0 -11.919,5.41 -11.919,12.084 0,6.675 5.336,12.085 11.919,12.085 C -5.335,12.085 0,6.675 0,0"/></g><g transform="translate(30.04,34.7427)" id="g40"><path id="path42" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.646,0 -3.135,-0.676 -4.214,-1.77 l 8.429,-8.544 C 5.293,-9.221 5.96,-7.71 5.96,-6.042 5.96,-2.706 3.291,0 0,0"/></g><g transform="translate(5.96,34.7427)" id="g44"><path id="path46" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.645,0 3.135,-0.676 4.214,-1.77 l -8.429,-8.544 C -5.292,-9.221 -5.96,-7.71 -5.96,-6.042 -5.96,-2.706 -3.292,0 0,0"/></g><g transform="translate(23,16)" id="g48"><path id="path50" style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -5,0 c -0.552,0 -1,0.447 -1,1 l 0,9 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L -4,2 0,2 C 0.553,2 1,1.552 1,1 1,0.447 0.553,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M20 6.042c0 1.112-.903 2.014-2 2.014s-2-.902-2-2.014V2.014C16 .901 16.903 0 18 0s2 .901 2 2.014v4.028z"/><path fill="#FFAC33" d="M9.18 36c-.224 0-.452-.052-.666-.159-.736-.374-1.035-1.28-.667-2.027l8.94-18.127c.252-.512.768-.835 1.333-.835s1.081.323 1.333.835l8.941 18.127c.368.747.07 1.653-.666 2.027-.736.372-1.631.07-1.999-.676L18.121 19.74l-7.607 15.425c-.262.529-.788.835-1.334.835z"/><path fill="#58595B" d="M18.121 20.392c-.263 0-.516-.106-.702-.295L3.512 5.998c-.388-.394-.388-1.031 0-1.424s1.017-.393 1.404 0L18.121 17.96 31.324 4.573c.389-.393 1.017-.393 1.405 0 .388.394.388 1.031 0 1.424l-13.905 14.1c-.187.188-.439.295-.703.295z"/><path fill="#DD2E44" d="M34.015 19.385c0 8.898-7.115 16.111-15.894 16.111-8.777 0-15.893-7.213-15.893-16.111 0-8.9 7.116-16.113 15.893-16.113 8.778-.001 15.894 7.213 15.894 16.113z"/><path fill="#E6E7E8" d="M30.041 19.385c0 6.674-5.335 12.084-11.92 12.084-6.583 0-11.919-5.41-11.919-12.084C6.202 12.71 11.538 7.3 18.121 7.3c6.585-.001 11.92 5.41 11.92 12.085z"/><path fill="#FFCC4D" d="M30.04 1.257c-1.646 0-3.135.676-4.214 1.77l8.429 8.544C35.333 10.478 36 8.968 36 7.299c0-3.336-2.669-6.042-5.96-6.042zm-24.08 0c1.645 0 3.135.676 4.214 1.77l-8.429 8.544C.667 10.478 0 8.968 0 7.299c0-3.336 2.668-6.042 5.96-6.042z"/><path fill="#414042" d="M23 20h-5c-.552 0-1-.447-1-1v-9c0-.552.448-1 1-1s1 .448 1 1v8h4c.553 0 1 .448 1 1 0 .553-.447 1-1 1z"/></svg> \ No newline at end of file |