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/1f1f2-1f1ea.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/1f1f2-1f1ea.svg')
-rw-r--r-- | public/emoji/1f1f2-1f1ea.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f1f2-1f1ea.svg b/public/emoji/1f1f2-1f1ea.svg index 45e00923e..47c5b2e52 100644 --- a/public/emoji/1f1f2-1f1ea.svg +++ b/public/emoji/1f1f2-1f1ea.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,9)" id="g20"><path id="path22" style="fill:#ffcc4d;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,18 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(35,9)" id="g24"><path id="path26" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.657 -1.343,-3 -3,-3 l -28,0 c -1.657,0 -3,1.343 -3,3 l 0,18 c 0,1.657 1.343,3 3,3 l 28,0 c 1.657,0 3,-1.343 3,-3 L 0,0 Z"/></g><g transform="translate(22.8848,18.5991)" id="g28"><path id="path30" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.604,2.41 -1.354,4.541 -1.354,4.541 L -1.867,2.04 -2.922,0.651 -2.484,-0.128 -2.921,-0.371 -3.958,1.066 -3.574,1.936 -2.238,2.625 -3.717,3.114 -4.613,2.071 -4.885,0.918 -5.227,2.071 -6.195,3.114 -7.583,2.797 -6.419,2.021 -5.954,1.066 -6.907,-0.417 -7.428,-0.128 -6.99,0.651 -8.044,2.04 -8.558,4.541 c 0,0 -1.957,-2.131 -1.354,-4.541 0.604,-2.41 3.201,-2.748 3.201,-2.748 l -1.652,-1.117 -0.967,-0.078 -0.165,-1.061 0.876,-0.408 0.77,0.844 1.917,0.703 -1.093,-1.594 2.14,-1.14 2.07,1.14 -1.07,1.509 0,0.063 1.84,-0.681 0.761,-0.844 0.872,0.408 -0.168,1.061 -0.969,0.078 -1.652,1.117 c 0,0 2.597,0.338 3.201,2.748"/></g><g transform="translate(18,16.5)" id="g32"><path id="path34" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-1.297 c 0,0 -0.181,0.272 -0.75,0.438 C -1.5,-0.641 -1.625,0 -1.625,0 L 0,0 Z"/></g><g transform="translate(18.002,16.5)" id="g36"><path id="path38" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-1.297 c 0,0 0.181,0.272 0.75,0.438 C 1.5,-0.641 1.625,0 1.625,0 L 0,0 Z"/></g><g transform="translate(16.7344,19.2031)" id="g40"><path id="path42" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.734,-0.297 1.266,-0.031 l 0,-2.547 -1.625,0 c 0,0 -0.063,0.547 0.156,1.266 0.137,0.448 -0.125,0.812 -0.125,0.812 L 0,0 Z"/></g><g transform="translate(19.2676,19.2031)" id="g44"><path id="path46" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.734,-0.297 -1.266,-0.031 l 0,-2.547 1.625,0 c 0,0 0.063,0.547 -0.156,1.266 C 0.066,-0.864 0.328,-0.5 0.328,-0.5 L 0,0 Z"/></g><g transform="translate(23.0781,14.8281)" id="g48"><path id="path50" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.44 -0.356,-0.797 -0.797,-0.797 -0.44,0 -0.797,0.357 -0.797,0.797 0,0.441 0.357,0.797 0.797,0.797 C -0.356,0.797 0,0.441 0,0"/></g><g transform="translate(19.0313,21.9766)" id="g52"><path id="path54" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.22 -0.437,-0.399 -0.977,-0.399 -0.539,0 -0.976,0.179 -0.976,0.399 0,0.22 0.437,0.398 0.976,0.398 C -0.437,0.398 0,0.22 0,0"/></g><g transform="translate(19.0938,22.4966)" id="g56"><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.187,-0.082 -0.266,0.066 -0.113,0.228 0.153,0.162 -0.028,0.541 -0.028,0.541 0,0 0.266,-0.156 0.297,-0.313 C 0.187,0.3 0.187,0.081 0,0 M -0.527,0.236 C -0.57,0.11 -0.578,0.035 -0.646,0.014 c -0.068,-0.021 -0.322,0.089 -0.322,0.089 0,0 0.124,0.166 0.156,0.322 0.031,0.156 -0.078,0.474 -0.078,0.474 0,0 0.39,-0.13 0.421,-0.286 0.032,-0.157 -0.015,-0.25 -0.058,-0.377 M -1.495,0.014 c -0.067,0.021 -0.075,0.096 -0.118,0.222 -0.043,0.127 -0.09,0.22 -0.059,0.377 0.031,0.156 0.422,0.286 0.422,0.286 0,0 -0.109,-0.318 -0.078,-0.474 0.031,-0.156 0.156,-0.322 0.156,-0.322 0,0 -0.255,-0.11 -0.323,-0.089 M -2.141,0 C -2.328,0.081 -2.328,0.3 -2.297,0.456 -2.266,0.613 -2,0.769 -2,0.769 -2,0.769 -2.181,0.39 -2.028,0.228 -1.875,0.066 -1.953,-0.082 -2.141,0 m 1.079,1.253 c -0.846,0 -1.532,-0.395 -1.532,-0.882 0,-0.488 0.686,-0.883 1.532,-0.883 0.845,0 1.531,0.395 1.531,0.883 0,0.487 -0.686,0.882 -1.531,0.882"/></g><g transform="translate(23.0752,14.7422)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.027,-0.109 -0.139,-0.174 -0.247,-0.146 l -1.104,0.287 c -0.108,0.028 -0.172,0.14 -0.145,0.248 0.028,0.109 0.139,0.173 0.247,0.146 L -0.145,0.248 C -0.037,0.219 0.03,0.109 0,0"/></g><g transform="translate(22.4951,14.8691)" id="g64"><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.024,-0.096 -0.121,-0.154 -0.219,-0.129 -0.096,0.025 -0.153,0.122 -0.128,0.22 L -0.1,1.222 C -0.075,1.316 0.021,1.375 0.119,1.35 0.216,1.324 0.272,1.227 0.247,1.131 L 0,0 Z"/></g><g transform="translate(14.835,12.125)" id="g68"><path id="path70" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.06,-0.023 -0.166,0.102 -0.235,0.278 L -2.181,5.22 c -0.07,0.177 -0.077,0.34 -0.017,0.363 l 0.098,0.04 c 0.061,0.023 0.315,-0.043 0.384,-0.22 L 0.229,0.462 C 0.299,0.285 0.159,0.064 0.098,0.039 L 0,0 Z"/></g><path id="path72" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.814,16.625 -1.631,0 0,1.127 1.631,0 0,-1.127 z"/></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFCC4D" d="M36 27c0 2.209-1.791 4-4 4H4c-2.209 0-4-1.791-4-4V9c0-2.209 1.791-4 4-4h28c2.209 0 4 1.791 4 4v18z"/><path fill="#DD2E44" d="M35 27c0 1.657-1.343 3-3 3H4c-1.657 0-3-1.343-3-3V9c0-1.657 1.343-3 3-3h28c1.657 0 3 1.343 3 3v18z"/><path fill="#FFCC4D" d="M22.885 17.401c.604-2.41-1.354-4.542-1.354-4.542l-.513 2.501-1.055 1.39.438.779-.437.242-1.037-1.437.384-.869 1.336-.689-1.479-.489-.896 1.043L18 16.483l-.342-1.153-.968-1.043-1.388.316 1.163.776.465.955-.953 1.483-.521-.289.438-.779-1.054-1.39-.513-2.501S12.37 14.99 12.973 17.4c.604 2.41 3.201 2.747 3.201 2.747l-1.652 1.117-.967.078-.165 1.062.876.407.77-.844 1.918-.703-1.094 1.594L18 24l2.069-1.141L19 21.351v-.062l1.84.681.761.844.872-.407-.168-1.062-.969-.078-1.652-1.117c0-.002 2.597-.34 3.201-2.749z"/><path fill="#5C913B" d="M18 19.5v1.297s-.181-.271-.75-.438c-.75-.219-.875-.859-.875-.859H18zm.002 0v1.297s.181-.271.75-.438c.75-.219.875-.859.875-.859h-1.625z"/><path fill="#269" d="M16.734 16.797s.734.297 1.266.031v2.547h-1.625s-.062-.547.156-1.266c.137-.449-.125-.812-.125-.812l.328-.5zm2.534 0s-.734.297-1.266.031v2.547h1.625s.062-.547-.156-1.266c-.137-.449.125-.812.125-.812l-.328-.5zm3.81 4.375c0 .44-.356.797-.797.797-.441 0-.797-.356-.797-.797 0-.441.356-.797.797-.797.441 0 .797.356.797.797z"/><path fill="#FFCC4D" d="M19.031 14.023c0 .22-.437.398-.977.398s-.977-.178-.977-.398c0-.22.437-.398.977-.398s.977.178.977.398z"/><path fill="#FFCC4D" d="M18.031 12.25c-.846 0-1.531.395-1.531.883s.685.883 1.531.883c.846 0 1.531-.395 1.531-.883s-.685-.883-1.531-.883zm-1.078 1.253c-.188-.082-.188-.3-.156-.457.031-.156.297-.312.297-.312s-.181.379-.028.541c.153.163.075.31-.113.228zm.646-.013c-.068-.021-.076-.096-.119-.223s-.09-.22-.059-.377c.031-.156.421-.287.421-.287s-.109.318-.078.474c.031.156.156.322.156.322s-.253.112-.321.091zm.967-.223c-.043.127-.051.202-.119.223-.068.021-.322-.089-.322-.089s.125-.166.156-.322-.078-.474-.078-.474.39.13.421.287c.032.155-.015.249-.058.375zm.528.236c-.188.082-.266-.066-.113-.228.153-.162-.028-.541-.028-.541s.266.156.297.312c.031.157.031.376-.156.457zm3.981 7.755c-.027.109-.139.174-.247.147l-1.104-.287c-.108-.028-.173-.141-.146-.248.028-.109.139-.174.247-.146l1.104.287c.109.028.176.137.146.247z"/><path fill="#FFCC4D" d="M22.495 21.131c-.024.096-.121.154-.219.129-.097-.025-.153-.122-.128-.22l.247-1.131c.024-.095.121-.153.219-.128.097.025.153.123.128.219l-.247 1.131zm-7.66 2.744c-.06.023-.166-.102-.235-.278l-1.945-4.941c-.07-.177-.078-.34-.018-.364l.099-.039c.061-.023.314.043.384.219l1.945 4.941c.07.177-.071.398-.131.423l-.099.039zm2.349-5.627h1.631v1.127h-1.631z"/></svg> \ No newline at end of file |