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/1f96a.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/1f96a.svg')
-rw-r--r-- | public/emoji/1f96a.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f96a.svg b/public/emoji/1f96a.svg index c708089af..d514ba76e 100644 --- a/public/emoji/1f96a.svg +++ b/public/emoji/1f96a.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(33.874,14.2793)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.909,4.226 -6.907,4.228 c -1.526,0.934 -4.001,0.934 -5.527,0 0,0 -5.527,-3.382 -6.908,-4.228 -1.382,-0.845 -0.691,-1.268 -2.072,-2.114 -1.382,-0.844 -2.072,-0.422 -3.454,-1.267 -1.383,-0.845 -1.526,-2.447 0,-3.382 l 6.907,-4.228 6.909,-4.227 c 1.525,-0.935 4.145,-0.848 5.524,0 1.383,0.845 0.693,1.266 2.074,2.114 1.381,0.844 2.071,0.422 3.454,1.266 C -5.526,-6.765 0,-3.385 0,-3.385 1.524,-2.45 1.525,-0.935 0,0"/></g><g transform="translate(35,14.4844)" id="g24"><path id="path26" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -34,0.516 -34,-1.109 0.018,-1.901 0,0 Z"/></g><g transform="translate(35,15.4844)" id="g28"><path id="path30" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -34,0.516 -34,-1.109 0.018,-1.901 0,0 Z"/></g><g transform="translate(33.873,17.2793)" id="g32"><path id="path34" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.908,4.226 -6.907,4.228 c -1.526,0.934 -4.001,0.934 -5.527,0 0,0 -5.527,-3.382 -6.908,-4.228 -1.381,-0.845 -0.691,-1.268 -2.072,-2.114 -1.382,-0.844 -2.072,-0.422 -3.454,-1.267 -1.383,-0.845 -1.526,-2.447 0,-3.382 l 6.907,-4.228 6.909,-4.227 c 1.526,-0.935 4.145,-0.848 5.524,0 1.383,0.845 0.693,1.266 2.074,2.114 1.381,0.844 2.071,0.422 3.454,1.266 C -5.525,-6.765 0,-3.385 0,-3.385 1.525,-2.45 1.526,-0.935 0,0"/></g><g transform="translate(32.8496,16.4316)" id="g36"><path id="path38" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.072,4.229 -7.071,4.227 c 0,0 -1.506,0.791 -2.828,0 0,0 -5.766,-3.447 -6.963,-4.162 -1.196,-0.716 -1.033,-1.464 -2.23,-2.179 -1.196,-0.715 -2.338,-0.553 -3.535,-1.267 -1.414,-0.847 0,-1.694 0,-1.694 l 7.071,-4.227 7.071,-4.228 c 0,0 1.414,-0.844 2.828,0 1.198,0.717 0.926,1.398 2.122,2.115 1.197,0.716 2.447,0.619 3.644,1.334 1.197,0.713 6.963,4.163 6.963,4.163 0,0 1.321,0.9 0,1.689"/></g><g transform="translate(7.9937,10.4336)" id="g40"><path id="path42" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.925,-0.786 0.997,-3.518 3.249,-2.063 3.81,-3.172 7.205,-5.906 9.548,-2.165 10.033,-3.043 15.32,-4.413 16.423,0.079 16.601,0.68 10.395,1.964 7.063,1.944 5.224,1.934 1.745,1.484 0,0"/></g><g transform="translate(3.1626,18.2012)" id="g44"><path id="path46" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.784,-0.737 -2.265,-2.22 -0.688,-4.439 0,-5.602 1.428,-6.358 1.618,-5.999 c 0.445,0.846 1.334,1.586 2.669,1.507 -0.017,0.301 -0.649,-2.733 1.577,-3.541 1.092,-0.396 2.265,0.238 3.6,1.638 2.137,2.243 7.582,1.196 9.11,0.609 1.547,-0.596 2.903,-0.985 2.498,-2.576 -0.089,-0.35 0.722,-0.654 1.548,-0.364 1.388,0.487 3.395,1.694 3.75,3.018 0.991,0.173 1.734,-0.102 2.305,-0.858 0.284,-0.373 1.254,-0.463 1.669,0.025 0.733,0.861 1.934,3.505 0.233,5.774 C 28.635,1.823 25.682,3.197 19.05,3.752 12.417,4.306 3.883,3.645 0,0"/></g><g transform="translate(31,10.959)" id="g48"><path id="path50" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.529 -0.895,-0.959 -2,-0.959 l -22,0 c -1.104,0 -2,0.43 -2,0.959 l 0,10.551 c 0,0.53 0.896,0.49 2,0.49 l 22,0 c 1.105,0 2,0.04 2,-0.49 L 0,0 Z"/></g><g transform="translate(33.3105,16.0127)" id="g52"><path id="path54" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-2.768 -4.586,-5.013 -10.242,-5.013 -5.658,0 -10.243,2.245 -10.243,5.013 0,2.769 4.585,5.013 10.243,5.013 C -4.586,5.013 0,2.769 0,0"/></g><g transform="translate(33.874,20.2793)" id="g56"><path id="path58" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.909,4.226 -6.907,4.228 c -1.526,0.934 -4.001,0.934 -5.527,0 0,0 -5.527,-3.382 -6.908,-4.228 -1.382,-0.845 -0.691,-1.268 -2.072,-2.114 -1.382,-0.844 -2.072,-0.422 -3.454,-1.267 -1.383,-0.845 -1.526,-2.447 0,-3.382 l 6.907,-4.228 6.909,-4.227 c 1.525,-0.935 4.145,-0.848 5.524,0 1.383,0.845 0.693,1.266 2.074,2.114 1.381,0.844 2.071,0.422 3.454,1.266 C -5.526,-6.765 0,-3.385 0,-3.385 1.524,-2.45 1.525,-0.935 0,0"/></g><g transform="translate(35,20.4844)" id="g60"><path id="path62" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -34,0.516 -34,-1.109 0.018,-1.901 0,0 Z"/></g><g transform="translate(35,21.4844)" id="g64"><path id="path66" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -34,0.516 -34,-1.109 0.018,-1.901 0,0 Z"/></g><g transform="translate(33.873,23.2793)" id="g68"><path id="path70" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.908,4.226 -6.907,4.228 c -1.526,0.934 -4.001,0.934 -5.527,0 0,0 -5.527,-3.382 -6.908,-4.228 -1.381,-0.845 -0.691,-1.268 -2.072,-2.114 -1.382,-0.844 -2.072,-0.422 -3.454,-1.267 -1.383,-0.845 -1.526,-2.447 0,-3.382 l 6.907,-4.228 6.909,-4.227 c 1.526,-0.935 4.145,-0.848 5.524,0 1.383,0.845 0.693,1.266 2.074,2.114 1.381,0.844 2.071,0.422 3.454,1.266 C -5.525,-6.765 0,-3.385 0,-3.385 1.525,-2.45 1.526,-0.935 0,0"/></g><g transform="translate(32.8496,22.4316)" id="g72"><path id="path74" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -7.072,4.229 -7.071,4.227 c 0,0 -1.506,0.791 -2.828,0 0,0 -5.766,-3.447 -6.963,-4.162 -1.196,-0.716 -1.033,-1.464 -2.23,-2.179 -1.196,-0.716 -2.338,-0.553 -3.535,-1.267 -1.414,-0.847 0,-1.694 0,-1.694 l 7.071,-4.227 7.071,-4.228 c 0,0 1.414,-0.844 2.828,0 1.198,0.717 0.926,1.398 2.122,2.115 1.197,0.716 2.447,0.619 3.644,1.334 1.197,0.713 6.963,4.163 6.963,4.163 0,0 1.321,0.9 0,1.689"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M35 20.516L1 20l.017 2.625c.017.593.355 1.188 1.08 1.632l6.907 4.228 6.908 4.227c1.526.935 4.145.848 5.525 0 1.383-.845.692-1.267 2.073-2.114 1.381-.844 2.071-.422 3.454-1.266 1.383-.848 6.909-4.227 6.909-4.227.761-.466 1.141-1.077 1.143-1.689l-.016-2.9z"/><path fill="#FFAC33" d="M33.873 18.721s-30.394-1.69-31.776-.845c-1.382.845-1.526 2.447 0 3.382l6.907 4.228 6.908 4.228c1.526.935 4.145.848 5.525 0 1.383-.845.692-1.267 2.073-2.114 1.381-.844 2.071-.422 3.454-1.266 1.383-.848 6.908-4.228 6.908-4.228 1.526-.935 1.527-2.451.001-3.385z"/><path fill="#FFD983" d="M10.222 24.642l7.071 4.228s1.414.844 2.828 0c1.197-.717 2.121-2.114 2.121-2.114l-12.02-2.114z"/><path fill="#77B255" d="M33.739 18.565c-1.941-2.589-26.694-4.412-30.577-.767-.784.737-2.265 2.22-.688 4.439.688 1.162 2.116 1.919 2.306 1.56.443-.842 1.327-1.578 2.653-1.507-.075.178.641 3.207.56 3.275-.925.786.997 3.518 3.249 2.063.561 1.108 3.956 3.843 6.299.102.466.844 5.36 2.128 6.719-1.766-.011.067-.008.124-.026.196-.089.35.722.653 1.548.363 1.389-.486 3.395-1.693 3.75-3.018.991-.173 1.734.102 2.306.858.283.374 1.254.464 1.669-.025.732-.859 1.933-3.503.232-5.773z"/><path fill="#FFCC4D" d="M31 25.041c0 .529-.896.959-2 .959H7c-1.104 0-2-.43-2-.959V18.49h26v6.551z"/><path fill="#BE1931" d="M33.311 19.987c0 2.768-4.586 5.013-10.242 5.013-5.658 0-10.243-2.245-10.243-5.013 0-2.769 4.585-5.013 10.243-5.013 5.656 0 10.242 2.245 10.242 5.013z"/><path fill="#F4900C" d="M35 14.516L1 14v2.625h.017c.017.593.355 1.188 1.08 1.632l6.907 4.228 6.908 4.227c1.526.935 4.145.848 5.525 0 1.383-.845.692-1.267 2.073-2.114 1.381-.844 2.071-.422 3.454-1.266 1.383-.848 6.909-4.227 6.909-4.227.761-.466 1.141-1.077 1.143-1.689v-.005L35 14.516z"/><path fill="#FFAC33" d="M33.873 12.721L20.058 4.267c-1.526-.934-4-.934-5.527 0L7.623 8.495c-1.381.845-.691 1.268-2.072 2.113-1.381.845-2.072.422-3.454 1.268-1.382.845-1.526 2.447 0 3.382l13.815 8.455c1.526.935 4.145.848 5.525 0 1.383-.845.692-1.267 2.073-2.114 1.381-.844 2.071-.422 3.454-1.266 1.383-.848 6.908-4.228 6.908-4.228 1.526-.934 1.527-2.45.001-3.384z"/><path fill="#FFD983" d="M32.85 13.568L18.707 5.113s-1.507-.791-2.829 0L8.916 9.275c-1.197.715-1.033 1.463-2.23 2.178-1.196.716-2.339.553-3.536 1.268-1.414.847 0 1.693 0 1.693l14.142 8.455s1.414.844 2.828 0c1.197-.717.926-1.397 2.121-2.114 1.197-.717 2.447-.619 3.644-1.334 1.197-.714 6.963-4.163 6.963-4.163s1.323-.901.002-1.69z"/></svg> \ No newline at end of file |