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/264c.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/264c.svg')
| -rw-r--r-- | public/emoji/264c.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/264c.svg b/public/emoji/264c.svg index 8529aac4e..e9af63db9 100644 --- a/public/emoji/264c.svg +++ b/public/emoji/264c.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,4)" id="g20"><path id="path22" style="fill:#9266cc;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,28 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><g transform="translate(11.999,18.5)" id="g24"><path id="path26" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.93,0 -3.5,-1.57 -3.5,-3.5 -3.5,-5.43 -1.93,-7 0,-7 1.93,-7 3.5,-5.43 3.5,-3.5 3.5,-1.57 1.93,0 0,0 m 0,-10 c -3.584,0 -6.5,2.916 -6.5,6.5 C -6.5,0.084 -3.584,3 0,3 3.584,3 6.5,0.084 6.5,-3.5 6.5,-7.084 3.584,-10 0,-10"/></g><g transform="translate(25.5527,6.2324)" id="g28"><path id="path30" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.654,0 -1.337,0.114 -2.028,0.345 -1.655,0.551 -2.784,1.78 -3.18,3.46 -0.64,2.71 0.737,6.167 3.594,9.024 1.911,1.911 2.75,4.625 1.993,6.451 -0.681,1.643 -2.514,1.988 -3.932,1.988 -2.173,0 -4.5,-1.407 -4.5,-3.5 0,-1.822 0.388,-2.813 0.799,-3.863 0.618,-1.581 1.257,-3.216 0.124,-6.612 -0.262,-0.784 -1.111,-1.211 -1.897,-0.948 -0.786,0.261 -1.211,1.111 -0.949,1.897 0.789,2.366 0.465,3.196 -0.072,4.571 -0.448,1.144 -1.005,2.568 -1.005,4.955 0,4.014 3.893,6.5 7.5,6.5 4.448,0 6.11,-2.406 6.703,-3.839 C 4.371,17.482 3.284,13.485 0.507,10.707 -1.875,8.325 -2.613,5.87 -2.288,4.494 -2.131,3.827 -1.747,3.413 -1.079,3.19 c 0.91,-0.304 1.701,-0.244 2.285,0.178 0.456,0.329 0.74,0.865 0.74,1.4 0,0.828 0.672,1.5 1.5,1.5 0.828,0 1.5,-0.672 1.5,-1.5 C 4.946,3.264 4.204,1.83 2.96,0.934 2.101,0.314 1.087,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M36 32c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V4c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v28z"/><path fill="#FFF" d="M11.999 27.5c-3.584 0-6.5-2.916-6.5-6.5s2.916-6.5 6.5-6.5 6.5 2.916 6.5 6.5-2.916 6.5-6.5 6.5zm0-10c-1.93 0-3.5 1.57-3.5 3.5s1.57 3.5 3.5 3.5 3.5-1.57 3.5-3.5-1.57-3.5-3.5-3.5z"/><path fill="#FFF" d="M25.553 29.768c-.654 0-1.337-.114-2.028-.345-1.654-.552-2.783-1.78-3.18-3.46-.64-2.71.737-6.167 3.594-9.024 1.911-1.912 2.75-4.625 1.993-6.452C25.251 8.845 23.418 8.5 22 8.5c-2.173 0-4.5 1.406-4.5 3.5 0 1.821.388 2.812.798 3.862.618 1.581 1.257 3.216.125 6.612-.262.784-1.111 1.211-1.897.948-.786-.262-1.21-1.111-.948-1.897.789-2.366.465-3.196-.073-4.57C15.057 15.811 14.5 14.387 14.5 12c0-4.015 3.893-6.5 7.5-6.5 4.448 0 6.109 2.405 6.703 3.839 1.221 2.947.134 6.944-2.643 9.722-2.382 2.382-3.12 4.837-2.795 6.213.157.667.541 1.081 1.209 1.304.91.305 1.701.244 2.285-.178.456-.329.74-.865.74-1.399 0-.828.672-1.5 1.5-1.5s1.5.672 1.5 1.5c0 1.504-.742 2.938-1.986 3.834-.86.618-1.873.933-2.96.933z"/></svg> \ No newline at end of file |
