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/1f328.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/1f328.svg')
| -rw-r--r-- | public/emoji/1f328.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f328.svg b/public/emoji/1f328.svg index 35476fa95..f937107a0 100644 --- a/public/emoji/1f328.svg +++ b/public/emoji/1f328.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(28,32)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.825,0 -1.62,-0.125 -2.369,-0.357 -3.256,2.178 -5.662,4 -8.5,4 -11.544,4 -14.092,1.904 -14.799,-0.921 -15.553,-0.351 -16.481,0 -17.5,0 -19.985,0 -22,-2.015 -22,-4.5 c 0,-0.604 0.123,-1.178 0.339,-1.704 C -22.09,-6.085 -22.533,-6 -23,-6 c -2.762,0 -5,-2.238 -5,-5 0,-2.762 2.238,-5 5,-5 l 23,0 c 4.418,0 8,3.581 8,8 0,4.418 -3.582,8 -8,8"/></g><g transform="translate(4,4.5)" id="g24"><path id="path26" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(6.3477,6.4326)" id="g28"><path id="path30" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(0.6514,6.4326)" id="g32"><path id="path34" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g><g transform="translate(14,0.5)" id="g36"><path id="path38" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(16.3477,2.4326)" id="g40"><path id="path42" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(10.6514,2.4326)" id="g44"><path id="path46" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g><g transform="translate(12,8.5)" id="g48"><path id="path50" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(14.3477,10.4326)" id="g52"><path id="path54" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(8.6514,10.4326)" id="g56"><path id="path58" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g><g transform="translate(22,7.5)" id="g60"><path id="path62" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(24.3477,9.4326)" id="g64"><path id="path66" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(18.6514,9.4326)" id="g68"><path id="path70" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g><g transform="translate(32,8.5)" id="g72"><path id="path74" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(34.3477,10.4326)" id="g76"><path id="path78" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(28.6514,10.4326)" id="g80"><path id="path82" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g><g transform="translate(27,0.5)" id="g84"><path id="path86" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.276 -0.224,-0.5 -0.5,-0.5 -0.776,-0.5 -1,-0.276 -1,0 l 0,6 c 0,0.276 0.224,0.5 0.5,0.5 C -0.224,6.5 0,6.276 0,6 L 0,0 Z"/></g><g transform="translate(29.3477,2.4326)" id="g88"><path id="path90" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.239,-0.138 0.32,-0.443 0.183,-0.683 0.045,-0.923 -0.261,-1.004 -0.5,-0.866 l -5.196,3 c -0.24,0.138 -0.322,0.443 -0.183,0.683 0.138,0.24 0.443,0.321 0.683,0.183 L 0,0 Z"/></g><g transform="translate(23.6514,2.4326)" id="g92"><path id="path94" style="fill:#5dadec;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.239,-0.138 -0.32,-0.443 -0.183,-0.683 0.138,-0.24 0.444,-0.321 0.683,-0.183 l 5.196,3 C 5.936,2.272 6.018,2.577 5.879,2.817 5.741,3.057 5.436,3.138 5.196,3 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M28 4c-.825 0-1.62.125-2.369.357C24.744 1.822 22.338 0 19.5 0c-3.044 0-5.592 2.096-6.299 4.921C12.447 4.351 11.519 4 10.5 4 8.015 4 6 6.015 6 8.5c0 .604.123 1.178.339 1.704C5.91 10.085 5.467 10 5 10c-2.762 0-5 2.238-5 5s2.238 5 5 5h23c4.418 0 8-3.581 8-8 0-4.418-3.582-8-8-8z"/><path d="M6.53 26.75c-.138-.239-.443-.32-.683-.183L4 27.634V25.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684L2.499 28.5.651 29.567c-.239.138-.32.443-.183.683.138.24.443.321.683.184L3 29.366V31.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L4.5 28.5l1.848-1.067c.239-.138.321-.443.182-.683zm10 4c-.138-.239-.443-.32-.683-.183L14 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L13 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L14.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683zM11 27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L12.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L12 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L11 25.366V27.5zm12.848-.066c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L22.5 25.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L22 24.634V22.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L21 26.366V28.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067zm10.5-1.867L32.5 24.5l1.848-1.067c.239-.139.321-.443.183-.684-.138-.239-.443-.32-.683-.183L32 23.634V21.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L31 25.366V27.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.137-.239.056-.545-.183-.683zM29.53 30.75c-.138-.239-.443-.32-.683-.183L27 31.634V29.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5v2.135l-1.849-1.067c-.239-.138-.545-.057-.683.183-.139.24-.057.545.183.684l1.848 1.067-1.848 1.067c-.239.138-.32.443-.183.683.138.24.443.321.683.184L26 33.366V35.5c0 .276.224.5.5.5s.5-.224.5-.5v-2.133l1.848 1.067c.239.138.545.057.683-.184.138-.239.057-.545-.183-.683L27.5 32.5l1.848-1.067c.239-.138.321-.443.182-.683z" fill="#5DADEC"/></svg> \ No newline at end of file |
