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/ae.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/ae.svg')
| -rw-r--r-- | public/emoji/ae.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/ae.svg b/public/emoji/ae.svg index 012e11635..a41b2a210 100644 --- a/public/emoji/ae.svg +++ b/public/emoji/ae.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(18,2)" id="g20"><path id="path22" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -8.836,0 -16,7.163 -16,15.999 -16,24.836 -8.836,32 0,32 8.837,32 16,24.836 16,15.999 16,7.163 8.837,0 0,0 M 0,34 C -9.941,34 -18,25.94 -18,15.999 -18,6.059 -9.941,-2 0,-2 9.941,-2 18,6.059 18,15.999 18,25.94 9.941,34 0,34"/></g><g transform="translate(15.4282,19.3096)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 3.193,0 c 1.705,0 2.885,1.023 2.885,2.759 0,1.767 -1.18,2.729 -2.885,2.729 L 0,5.488 0,0 Z m -4.651,7.348 c 0,1.488 0.837,2.419 2.387,2.419 l 5.457,0 c 4.775,0 7.721,-2.14 7.721,-7.008 0,-3.41 -2.574,-5.364 -5.737,-5.86 l 5.272,-5.643 c 0.433,-0.465 0.619,-0.93 0.619,-1.364 0,-1.209 -0.961,-2.387 -2.324,-2.387 -0.559,0 -1.303,0.217 -1.799,0.806 l -6.884,8.34 -0.061,0 0,-6.728 c 0,-1.551 -0.992,-2.418 -2.326,-2.418 -1.333,0 -2.325,0.867 -2.325,2.418 l 0,17.425 z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M18 0C8.059 0 0 8.06 0 18c0 9.941 8.059 18 18 18s18-8.059 18-18c0-9.94-8.059-18-18-18zm0 34C9.164 34 2 26.837 2 18 2 9.164 9.164 2 18 2c8.837 0 16 7.164 16 16 0 8.837-7.163 16-16 16z"/><path fill="#292F33" d="M10.777 9.342c0-1.488.837-2.418 2.388-2.418h5.457c4.775 0 7.72 2.14 7.72 7.007 0 3.411-2.573 5.364-5.736 5.86l5.272 5.644c.433.465.619.93.619 1.364 0 1.209-.961 2.387-2.324 2.387-.559 0-1.303-.217-1.799-.806l-6.883-8.341h-.062v6.728c0 1.551-.992 2.418-2.326 2.418s-2.326-.867-2.326-2.418V9.342zm4.651 7.348h3.193c1.705 0 2.884-1.023 2.884-2.759 0-1.767-1.18-2.729-2.884-2.729h-3.193v5.488z"/></svg> \ No newline at end of file |
