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/1f574-1f3ff.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/1f574-1f3ff.svg')
| -rw-r--r-- | public/emoji/1f574-1f3ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f574-1f3ff.svg b/public/emoji/1f574-1f3ff.svg index bae73e205..28fd4074e 100644 --- a/public/emoji/1f574-1f3ff.svg +++ b/public/emoji/1f574-1f3ff.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(14,14)" id="g20"><path id="path22" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.448,-1 -1,-1 -0.552,0 -1,0.447 -1,1 l 0,8 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(24,14)" id="g24"><path id="path26" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -0.447,-1 -1,-1 -0.553,0 -1,0.447 -1,1 l 0,8 c 0,0.552 0.447,1 1,1 0.553,0 1,-0.448 1,-1 L 0,0 Z"/></g><g transform="translate(19,17)" id="g28"><path id="path30" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -3,0 1,-11 3,0 0,7 0,-7 3,0 1,11 -3,0 z"/></g><g transform="translate(18,13)" id="g32"><path id="path34" style="fill:#546170;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.552,0 -1,-7 -1,-7 0,-0.553 0.448,0 1,0 0.553,0 1,-0.553 1,0 0,0 -0.447,7 -1,7"/></g><g transform="translate(22,25)" id="g36"><path id="path38" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2,0 -4,0 -2,0 c -1.104,0 -2,-0.895 -2,-2 l 0,-8 2,0 0,-1 2,0 2,1 2,-1 2,0 0,1 2,0 0,8 C 2,-0.895 1.105,0 0,0"/></g><g transform="translate(16.6396,6.5205)" id="g40"><path id="path42" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.105,0 1.346,-0.159 1.359,-0.521 1.411,-1.896 -0.427,-4 -1.781,-3.5 c -0.86,0.317 -0.422,1.901 0.14,2.979 C -1.41,-0.079 -0.679,0 0,0"/></g><g transform="translate(19.3604,6.5205)" id="g44"><path id="path46" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.105,0 -1.346,-0.159 -1.359,-0.521 -1.41,-1.896 0.428,-4 1.781,-3.5 2.642,-3.183 2.203,-1.599 1.641,-0.521 1.41,-0.079 0.68,0 0,0"/></g><g transform="translate(18,18)" id="g48"><path id="path50" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,0 -2,7 2,7 0,0 Z"/></g><g transform="translate(16.799,26)" id="g52"><path id="path54" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,-1.592 1.201,-2 2.402,-1.592 2.402,0 0,0 Z"/></g><g transform="translate(15.3042,29.1811)" id="g56"><path id="path58" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.592 -0.3,-1.071 -0.67,-1.071 -0.369,0 -0.669,0.479 -0.669,1.071 0,0.592 0.3,1.071 0.669,1.071 C -0.3,1.071 0,0.592 0,0"/></g><g transform="translate(22,29.1811)" id="g60"><path id="path62" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.592 -0.3,-1.071 -0.67,-1.071 -0.369,0 -0.669,0.479 -0.669,1.071 0,0.592 0.3,1.071 0.669,1.071 C -0.3,1.071 0,0.592 0,0"/></g><g transform="translate(18,25.0937)" id="g64"><path id="path66" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.923,0 -3.482,1.851 -3.482,4.135 -3.482,6.418 -1.923,8.27 0,8.27 1.923,8.27 3.482,6.418 3.482,4.135 3.482,1.851 1.923,0 0,0"/></g><g transform="translate(19.3049,26.9037)" id="g68"><path id="path70" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.015,0.025 -0.043,0.041 -0.073,0.041 l -2.454,0 C -2.557,0.041 -2.584,0.025 -2.6,0 c -0.015,-0.026 -0.017,-0.057 -0.003,-0.084 0.015,-0.029 0.372,-0.704 1.303,-0.704 0.931,0 1.288,0.675 1.303,0.704 C 0.017,-0.057 0.015,-0.026 0,0"/></g><g transform="translate(18.0077,28.0636)" id="g72"><path id="path74" style="fill:#3d2e24;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.269,0 -0.478,0.048 -0.646,0.122 0.056,-0.198 0.21,-0.474 0.646,-0.474 0.436,0 0.59,0.276 0.646,0.474 C 0.478,0.048 0.269,0 0,0"/></g><g transform="translate(14.8272,29.6042)" id="g76"><path id="path78" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.06,0.296 0.148,0.546 0.246,0.771 l -0.777,0 C -0.41,-0.104 -0.066,-0.324 0,0"/></g><g transform="translate(21.1727,29.7292)" id="g80"><path id="path82" style="fill:#0b0200;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.239,-0.47 0.475,-0.152 0.55,0.771 l -0.942,0 C -0.284,0.559 -0.142,0.28 0,0"/></g><path id="path84" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 18.375,17.617 -0.75,0 0,6 0.75,0 0,-6 z"/><g transform="translate(17,24.0002)" id="g86"><path id="path88" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,-1 2,0 1,0.417 0,0 Z"/></g><g transform="translate(16,25)" id="g90"><path id="path92" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1,-3 0.25,-3.344 -0.437,-4.469 2,-7 0,0 Z"/></g><g transform="translate(20,25)" id="g94"><path id="path96" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1,-3 -0.25,-3.344 0.437,-4.469 -2,-7 0,0 Z"/></g><g transform="translate(16.5625,25.4375)" id="g98"><path id="path100" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 1.437,-1.021 0.5,-2.016 -0.562,-0.437 0,0 Z"/></g><g transform="translate(19.4375,25.4375)" id="g102"><path id="path104" style="fill:#f5f8fa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -1.437,-1.021 -0.5,-2.016 0.562,-0.437 0,0 Z"/></g><g transform="translate(24,1)" id="g106"><path id="path108" style="fill:#99aab5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.553 -2.686,-1 -6,-1 -3.314,0 -6,0.447 -6,1 0,0.553 2.686,1 6,1 3.314,0 6,-0.447 6,-1"/></g><g transform="translate(23.227,31.1667)" id="g110"><path id="path112" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.66 -2.337,-1.333 -5.219,-1.333 -2.882,0 -5.219,0.673 -5.219,1.333 0,0.66 1.196,0.896 5.219,0.896 C -1.196,0.896 0,0.66 0,0"/></g><g transform="translate(20.1907,31.9843)" id="g114"><path id="path116" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.678,0.163 1.224,0.45 1.224,0.45 0,0 -0.141,0.578 -0.284,0.95 C 0.498,2.553 -0.235,3.129 -0.909,2.958 -1.928,2.699 -2.405,2.848 -3.621,2.992 -4.835,3.136 -5.394,1.31 -5.588,0.45 c 0,0 0.321,-0.274 0.901,-0.403 C -3.464,-0.226 -0.925,-0.222 0,0"/></g><g transform="translate(21.5832,31.7749)" id="g118"><path id="path120" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.012,0.069 -0.027,0.145 -0.043,0.22 -0.048,0.225 -0.126,0.439 -0.126,0.439 0,0 -1.101,-0.429 -3.406,-0.429 -2.305,0 -3.406,0.429 -3.406,0.429 0,0 -0.078,-0.214 -0.126,-0.439 C -7.123,0.145 -7.138,0.069 -7.15,0 c -0.048,-0.273 0.081,-0.461 0.967,-0.649 0.599,-0.127 1.582,-0.241 2.608,-0.22 1.026,-0.021 2.009,0.093 2.609,0.22 C -0.081,-0.461 0.048,-0.273 0,0"/></g><g transform="translate(21.4922,30.1025)" id="g122"><path id="path124" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.958,-0.316 c -0.337,0.047 -1.039,0.065 -1.78,-0.016 -0.197,-0.021 -0.272,-0.077 -0.738,-0.077 -0.467,0 -0.542,0.056 -0.739,0.077 -0.741,0.081 -1.442,0.063 -1.779,0.016 L -6.952,0 c -0.093,0.033 -0.191,-0.019 -0.221,-0.111 -0.03,-0.092 0.02,-0.191 0.111,-0.221 l 0.894,-0.295 c 0.066,-0.051 0.209,-0.148 0.242,-0.248 0.039,-0.116 0.117,-0.861 0.35,-1.055 0.241,-0.2 1.148,-0.126 1.322,-0.039 0.389,0.194 0.437,0.82 0.506,1.094 0.038,0.155 0.272,0.155 0.272,0.155 0,0 0.233,0 0.272,-0.155 0.069,-0.274 0.117,-0.902 0.505,-1.096 0.174,-0.086 1.081,-0.161 1.322,0.039 0.233,0.194 0.311,0.941 0.35,1.057 0.033,0.1 0.175,0.197 0.241,0.247 l 0.895,0.296 c 0.092,0.03 0.142,0.129 0.112,0.221 C 0.189,-0.019 0.087,0.033 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M14 22c0 .553-.448 1-1 1s-1-.447-1-1v-8c0-.552.448-1 1-1s1 .448 1 1v8zm10 0c0 .553-.447 1-1 1-.553 0-1-.447-1-1v-8c0-.552.447-1 1-1 .553 0 1 .448 1 1v8z"/><path fill="#66757F" d="M19 19h-5l1 11h3v-7 7h3l1-11z"/><path fill="#546170" d="M18 23c-.552 0-1 7-1 7 0 .553.448 0 1 0 .553 0 1 .553 1 0 0 0-.447-7-1-7z"/><path fill="#292F33" d="M22 11h-8c-1.104 0-2 .896-2 2v8h2v1h2l2-1 2 1h2v-1h2v-8c0-1.104-.896-2-2-2zm-5.36 18.479c1.105 0 1.346.159 1.359.521.052 1.375-1.786 3.479-3.141 2.979-.86-.317-.422-1.901.141-2.979.23-.441.962-.521 1.641-.521z"/><path fill="#292F33" d="M19.36 29.479c-1.105 0-1.346.159-1.359.521-.051 1.375 1.787 3.479 3.141 2.979.86-.317.422-1.901-.141-2.979-.23-.441-.961-.521-1.641-.521z"/><path fill="#E1E8ED" d="M18 18l-2-7h4z"/><path fill="#55ACEE" d="M17 15l1 3 1-3-1-2.417z"/><path fill="#7C533E" d="M16.799 10v1.592L18 12l1.201-.408V10zm-1.495-3.181c0 .592-.3 1.071-.67 1.071-.37 0-.67-.48-.67-1.071 0-.592.3-1.071.67-1.071.37-.001.67.479.67 1.071zm6.696 0c0 .592-.3 1.071-.67 1.071-.37 0-.67-.48-.67-1.071 0-.592.3-1.071.67-1.071.37-.001.67.479.67 1.071z"/><path fill="#7C533E" d="M18 10.906c-1.923 0-3.482-1.851-3.482-4.135S16.077 2.636 18 2.636s3.482 1.851 3.482 4.135-1.559 4.135-3.482 4.135"/><path fill="#3D2E24" d="M19.305 9.096c-.015-.025-.043-.041-.073-.041h-2.453c-.03 0-.058.015-.073.041-.015.025-.017.057-.003.084.015.029.372.704 1.303.704.931 0 1.288-.676 1.303-.704.013-.026.011-.058-.004-.084zm-1.297-1.16c-.269 0-.478-.048-.646-.122.055.198.21.474.646.474.436 0 .59-.276.646-.474-.168.074-.377.122-.646.122z"/><path fill="#0B0200" d="M14.827 6.396c.06-.296.148-.546.246-.771h-.777c.121.874.465 1.095.531.771zm6.346-.125c.239.47.475.152.55-.771h-.942l.392.771z"/><path fill="#66757F" d="M16 11l-1 3 1.25.344-.688 1.125L18 18zm4 0l1 3-1.25.344.688 1.125L18 18z"/><path fill="#55ACEE" d="M17 12l1 1 1-1-1-.417z"/><path fill="#F5F8FA" d="M16.562 10.562L18 11.583l-.938.995L16 11zm2.876 0L18 11.583l.938.995L20 11z"/><ellipse fill="#99AAB5" cx="18" cy="35" rx="6" ry="1"/><path fill="#292F33" d="M23.227 4.833c0 .66-2.337 1.333-5.219 1.333s-5.219-.673-5.219-1.333 1.196-.896 5.219-.896 5.219.236 5.219.896z"/><path fill="#292F33" d="M20.191 4.016c.678-.163 1.224-.45 1.224-.45s-.141-.578-.283-.95c-.442-1.154-1.175-1.729-1.849-1.558-1.019.259-1.496.11-2.712-.034-1.215-.144-1.773 1.682-1.967 2.542 0 0 .322.274.902.403 1.22.273 3.76.269 4.685.047z"/><path fill="#66757F" d="M21.583 4.225c-.012-.069-.027-.145-.043-.22-.048-.225-.126-.439-.126-.439s-1.101.429-3.406.429-3.406-.429-3.406-.429-.078.214-.126.439c-.016.076-.031.152-.043.22-.048.273.081.461.966.649.6.127 1.582.241 2.608.22 1.026.021 2.009-.093 2.608-.22.888-.188 1.017-.376.968-.649z"/><path fill="#292F33" d="M21.492 5.897l-.958.316c-.337-.047-1.038-.066-1.779.015-.197.022-.272.078-.739.078-.466 0-.542-.056-.739-.078-.741-.081-1.442-.062-1.779-.015l-.958-.316c-.093-.033-.191.019-.221.111s.02.19.111.221l.894.295c.066.051.208.148.242.248.039.116.117.861.35 1.055.241.2 1.148.125 1.322.039.389-.194.437-.82.505-1.094.039-.155.272-.155.272-.155s.233 0 .272.155c.069.274.117.902.505 1.096.174.087 1.081.161 1.322-.039.233-.194.311-.941.35-1.057.033-.1.175-.196.241-.247l.895-.295c.092-.03.142-.129.111-.221-.029-.093-.132-.144-.219-.112z"/></svg> \ No newline at end of file |
