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/1f36a.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/1f36a.svg')
-rw-r--r-- | public/emoji/1f36a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f36a.svg b/public/emoji/1f36a.svg index 31f6bf342..d1b604bcd 100644 --- a/public/emoji/1f36a.svg +++ b/public/emoji/1f36a.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(35,18)" id="g20"><path id="path22" style="fill:#d99e82;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-9.389 -7.611,-17 -17,-17 -9.389,0 -17,7.611 -17,17 0,9.389 7.611,17 17,17 C -7.611,17 0,9.389 0,0"/></g><g transform="translate(22.6377,19.0532)" id="g24"><path id="path26" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.177,0.385 2.444,-0.261 2.827,-1.44 3.211,-2.62 2.567,-3.887 1.386,-4.271 0.205,-4.655 -2.485,-4.472 -2.869,-3.293 -3.252,-2.112 -1.182,-0.382 0,0"/></g><g transform="translate(31.208,19.7246)" id="g28"><path id="path30" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.38,-0.452 -1.055,-0.512 -1.507,-0.131 -1.959,0.25 -2.018,0.924 -1.638,1.377 -1.257,1.828 -0.124,2.434 0.328,2.054 0.781,1.674 0.381,0.453 0,0"/></g><g transform="translate(9.208,26.7246)" id="g32"><path id="path34" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.38,-0.452 -1.055,-0.512 -1.507,-0.131 -1.959,0.25 -2.018,0.924 -1.638,1.377 -1.257,1.828 -0.124,2.434 0.328,2.054 0.781,1.674 0.381,0.453 0,0"/></g><g transform="translate(21.3008,28.6187)" id="g36"><path id="path38" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.748,0.478 -0.969,1.472 -0.49,2.22 -0.012,2.969 0.982,3.188 1.731,2.71 2.48,2.231 3.604,0.66 3.125,-0.088 2.646,-0.837 0.749,-0.479 0,0"/></g><g transform="translate(13.3745,22.4019)" id="g40"><path id="path42" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.515,1.066 -0.064,2.351 1.005,2.864 2.075,3.376 3.357,2.925 3.869,1.856 4.382,0.786 4.551,-1.787 3.482,-2.298 2.412,-2.812 0.512,-1.071 0,0"/></g><g transform="translate(14.3994,8.3027)" id="g44"><path id="path46" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.602,0.874 1.8,1.096 2.672,0.492 3.546,-0.113 3.766,-1.309 3.162,-2.183 2.559,-3.057 0.634,-4.33 -0.238,-3.727 -1.113,-3.123 -0.604,-0.873 0,0"/></g><g transform="translate(24.4121,8.709)" id="g48"><path id="path50" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.686,0.436 -0.889,1.348 -0.449,2.034 -0.011,2.72 0.899,2.92 1.586,2.481 2.271,2.043 3.301,0.604 2.862,-0.081 2.424,-0.769 0.686,-0.44 0,0"/></g><g transform="translate(5.5356,17.5796)" id="g52"><path id="path54" style="fill:#8a4b38;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.762,0.853 2.071,0.926 2.923,0.163 3.774,-0.601 3.847,-1.909 3.083,-2.759 2.321,-3.614 0.091,-4.714 -0.759,-3.951 -1.612,-3.187 -0.764,-0.851 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><circle fill="#D99E82" cx="18" cy="18" r="17"/><path fill="#8A4B38" d="M22.638 16.947c1.177-.385 2.444.261 2.827 1.44.384 1.179-.26 2.447-1.441 2.831-1.181.384-3.871.201-4.255-.978-.383-1.181 1.687-2.911 2.869-3.293zm8.57-.672c-.38.452-1.055.512-1.507.131-.452-.381-.511-1.055-.131-1.508.381-.451 1.514-1.057 1.966-.677.453.381.053 1.601-.328 2.054zm-22-7c-.38.452-1.055.512-1.507.131-.452-.381-.511-1.054-.131-1.508.381-.451 1.514-1.057 1.966-.677.453.381.053 1.601-.328 2.054zm12.093-1.894c-.748-.478-.969-1.472-.49-2.22.479-.749 1.473-.968 2.222-.49.749.479 1.872 2.05 1.394 2.798-.48.75-2.377.392-3.126-.088zm-7.926 6.217c-.515-1.066-.064-2.351 1.005-2.864s2.351-.061 2.864 1.008c.513 1.07.682 3.643-.387 4.154-1.071.514-2.971-1.227-3.482-2.298zm1.024 14.099c.602-.874 1.8-1.096 2.672-.492.874.605 1.094 1.801.49 2.675s-2.528 2.147-3.4 1.544c-.875-.604-.366-2.854.238-3.727zm10.013-.406c-.687-.436-.889-1.348-.449-2.034.438-.685 1.349-.886 2.035-.447.686.438 1.715 1.878 1.276 2.562-.438.688-2.176.359-2.862-.081zM5.536 18.42c.762-.853 2.071-.926 2.923-.163.852.764.924 2.071.161 2.922-.763.854-2.992 1.955-3.843 1.191-.854-.763-.005-3.099.759-3.95z"/></svg> \ No newline at end of file |