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/1f45e.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/1f45e.svg')
| -rw-r--r-- | public/emoji/1f45e.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f45e.svg b/public/emoji/1f45e.svg index 5b71d31ff..fe94bf599 100644 --- a/public/emoji/1f45e.svg +++ b/public/emoji/1f45e.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(2.7896,15.957)" id="g20"><path id="path22" style="fill:#c36446;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.513,-0.062 -1.032,-2.126 -0.518,-2.058 -0.953,-6.517 -0.954,-9.071 -0.001,-0.662 1.03,-1.064 1.03,-1.064 l 33.015,-0.023 c 0,0 1.031,0.437 1.032,1.064 10e-4,1.333 0.37,6.061 -2.818,5.982 -1.032,-0.026 -7.371,-0.878 -10.591,1.474 -1.189,0.868 -5.156,5.321 -7.216,6.387 C 10.402,3.688 10.316,-1.07 6.189,-1.068 2.063,-1.064 2.063,-0.002 0,0"/></g><g transform="translate(34.8467,0.4844)" id="g24"><path id="path26" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -7.328,-0.266 -13.518,-0.261 -6.192,0.004 -5.574,1.867 -7.116,1.867 -1.031,10e-4 -1.031,-1.591 -1.031,-1.593 L -33.014,0.02 c -0.77,0 -1.032,0.714 -1.032,1.595 10e-4,0.882 -0.106,1.597 1.033,1.597 L 0.002,3.188 C 1.14,3.191 1.154,2.396 1.153,1.516 1.153,1.516 1.139,-0.001 0,0"/></g><g transform="translate(13.4893,12.3828)" id="g28"><path id="path30" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.603,1.758 C 2.052,2.669 2.959,4.407 2.996,4.482 L 4.664,3.662 C 4.615,3.562 3.422,1.175 0,0"/></g><g transform="translate(16.5825,9.1895)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.604,1.758 C 2.051,2.669 2.958,4.406 2.995,4.479 L 4.662,3.66 C 4.613,3.559 3.42,1.176 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#C36446" d="M3.172 11.19s.272-.908 1.371-2.491 3.963-3.973 4.483-4.238c.519-.265.97-.399 1.408.128.332.399 2.391 4.183 4.359 5.661 2.335 1.753 4.887 1.519 6.424 1.122.868-.224 1.414-.501 1.414-.501s3.671 8.299 4.325 9.961c.216.55.413 1.09.617 1.548.701 1.574 1.84 2.885 3.146 4.06 1.307 1.175 2.509 1.92 2.835 2.191s3.575 2.243 1.692 5.181c0 0-7.25-1.047-14.39-5.907-5.536-3.769-5.829-6.843-12.438-11.968-4.41-3.418-5.246-4.747-5.246-4.747z"/><path fill="#803F29" d="M15.382 24.732c1.026 1.185 2.774 3.28 5.375 4.936 7.16 4.56 14.727 4.625 14.727 4.625l.128-.417c.053-.187-.061-.286-.205-.318-.686-.154-3.053-.693-4.286-1.162-2.577-.981-5.357-1.632-9.137-4.256s-5.593-5.031-7.273-6.852c-1.68-1.821-5.204-5.31-7.747-7.074-1.963-1.362-3.13-2.634-3.56-3.143-.1-.118-.215-.062-.303.065l-.872 1.259c0 .001 9.959 8.647 13.153 12.337z"/><path fill="#803F29" d="M22.003 24.025l-.305-.427c-4.889-6.835-9.47-5.766-10.342-5.482-.146.048-.678.211-.678.211l-.43-1.404c.001 0 .509-.156.65-.202 1.021-.333 6.28-1.594 11.649 5.554.551-.258 1.542-.81 2.706-1.858-.302-.84-.991-2.708-1.711-4.286-.965-2.117-2.328-4.76-2.328-4.76.595-.156 1.414-.501 1.414-.501s1.273 2.507 2.25 4.652c.986 2.163 1.884 4.756 1.922 4.865l.152.444-.339.325c-2.226 2.135-4.033 2.694-4.109 2.717l-.501.152z"/><path fill="#292F33" d="M9.221 22.139c.49-.062 1.438-.699 1.783-.639.345.061 2.654 2.527 3.711 3.707s2.882 3.207 5.445 4.985c2.563 1.779 6.403 3.327 8.809 4.237s4.949 1.417 5.469 1.442c.521.025.49-.148.585-.334.095-.186.46-1.245.46-1.245s-2.248-.299-4.851-1.298c-2.603-.999-5.418-1.675-9.244-4.33s-5.666-5.081-7.369-6.919c-1.703-1.837-5.275-5.359-7.848-7.145-1.985-1.377-3.018-2.55-3.478-3.043-.165-.176-.38-.062-.51.12L.434 13.984c-.153.221-.321.849.178 1.374.499.527 8.119 6.843 8.609 6.781zm11.598-7.493c-.326 0-.638-.186-.782-.501-.198-.431-.009-.942.422-1.14l2.385-1.096c.433-.198.943-.009 1.141.422.198.431.009.942-.422 1.14l-2.385 1.096c-.117.054-.239.079-.359.079zm1.474 2.902c-.322 0-.631-.182-.778-.492-.203-.429-.02-.942.409-1.145l2.371-1.122c.432-.203.942-.02 1.146.409.203.429.02.942-.409 1.145l-2.371 1.122c-.12.056-.245.083-.368.083zm1.397 3.039c-.317 0-.621-.176-.771-.479-.211-.426-.036-.941.389-1.152l2.225-1.101c.427-.212.94-.036 1.152.389.211.426.036.941-.389 1.152l-2.225 1.101c-.123.062-.253.09-.381.09z"/></svg> \ No newline at end of file |
