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/1f9de-200d-2642-fe0f.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/1f9de-200d-2642-fe0f.svg')
-rw-r--r-- | public/emoji/1f9de-200d-2642-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f9de-200d-2642-fe0f.svg b/public/emoji/1f9de-200d-2642-fe0f.svg index 030152363..af17a48e7 100644 --- a/public/emoji/1f9de-200d-2642-fe0f.svg +++ b/public/emoji/1f9de-200d-2642-fe0f.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(32,0)" id="g20"><path id="path22" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,2 c 0,3.314 -2.686,6 -6,6 l -16,0 c -3.313,0 -6,-2.686 -6,-6 l 0,-2 28,0 z"/></g><g transform="translate(13.6397,7.899)" id="g24"><path id="path26" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.744,-1.267 2.849,-3.728 4.36,-3.728 1.512,0 2.616,2.462 4.36,3.728 l 0,3.811 L 0,3.811 0,0 Z"/></g><g transform="translate(11.4444,20.0646)" id="g28"><path id="path30" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.805,1.109 -1.805,2.557 0,1.936 0.501,2.688 1.805,2.688 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(28,20)" id="g32"><path id="path34" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.9,-2.558 -1.806,-2.558 -0.905,0 -1.638,1.174 -1.638,2.623 0,1.448 0.733,2.622 1.638,2.622 C -0.454,2.687 0,1.935 0,0"/></g><g transform="translate(9.4777,19.0403)" id="g36"><path id="path38" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.589 1.522,11.96 8.522,11.96 7,0 8.523,-6.371 8.523,-11.96 0,-5.04 -2.523,-10.12 -8.523,-10.12 C 2.522,-10.12 0,-5.04 0,0"/></g><g transform="translate(21.7033,19.0923)" id="g40"><path id="path42" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.145,0 C -0.604,0 -0.98,0.376 -0.98,0.835 l 0,1.053 c 0,0.459 0.376,0.835 0.835,0.835 l 0.145,0 c 0.459,0 0.835,-0.376 0.835,-0.835 l 0,-1.053 C 0.835,0.376 0.459,0 0,0"/></g><g transform="translate(14.2967,19.0923)" id="g44"><path id="path46" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.145,0 C 0.604,0 0.98,0.376 0.98,0.835 l 0,1.053 c 0,0.459 -0.376,0.835 -0.835,0.835 L 0,2.723 c -0.459,0 -0.835,-0.376 -0.835,-0.835 l 0,-1.053 C -0.835,0.376 -0.459,0 0,0"/></g><g transform="translate(18.0072,12.1978)" id="g48"><path id="path50" style="fill:#226699;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.754,0 3.6,0.706 3.741,0.848 0.256,0.256 0.256,0.671 0,0.927 C 3.493,2.023 3.096,2.03 2.839,1.798 2.787,1.761 2.118,1.311 0,1.311 c -2.2,0 -2.836,0.485 -2.842,0.49 C -3.098,2.056 -3.499,2.044 -3.755,1.787 -4.011,1.531 -3.997,1.104 -3.741,0.848 -3.6,0.706 -2.754,0 0,0"/></g><g transform="translate(18.75,16.25)" id="g52"><path id="path54" style="fill:#55acee;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.5,0 c -0.413,0 -0.75,0.337 -0.75,0.75 0,0.413 0.337,0.75 0.75,0.75 L 0,1.5 C 0.413,1.5 0.75,1.163 0.75,0.75 0.75,0.337 0.413,0 0,0"/></g><g transform="translate(12.0163,8.0499)" id="g56"><path id="path58" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.157,-6.817 3.987,-6.817 l 0,-1.233 -7.019,0 c 0,0 -0.214,5.924 1.016,8 L 0,0 Z"/></g><g transform="translate(23.9707,8.0499)" id="g60"><path id="path62" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 0.157,-6.817 -3.987,-6.817 l 0,-1.233 7.019,0 c 0,0 0.214,5.924 -1.016,8 L 0,0 Z"/></g><g transform="translate(18,27.0659)" id="g64"><path id="path66" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 7.149,-1.858 8.245,-5.204 8.723,-4.183 9,-1.947 9,-0.686 9,3.153 6,5.934 1.125,5.934 l -2.25,0 C -5.25,5.934 -9,3.153 -9,-0.686 -9,-1.947 -8.723,-4.349 -8.246,-5.37 -7.149,-2.022 0,0 0,0"/></g><g transform="translate(26.9851,25.8234)" id="g68"><path id="path70" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.396,1.115 -3.044,2.036 -4.612,2.559 -4.977,2.681 -5.367,2.483 -5.488,2.121 -5.609,1.759 -5.413,1.367 -5.051,1.245 -3.385,0.69 -1.556,-0.421 -0.168,-1.69 -0.079,-1.066 -0.017,-0.361 0,0"/></g><g transform="translate(9.1167,24.6895)" id="g72"><path id="path74" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.007,1.436 8.723,5.759 16.398,5.819 15.924,6.363 15.414,6.756 14.819,7.126 8.113,6.628 2.392,3.287 -0.111,1.605 -0.102,1.15 -0.065,0.592 0,0"/></g><g transform="translate(26.4205,29.1099)" id="g76"><path id="path78" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.028,0.004 -0.084,0 -0.113,0 -2.835,0 -5.703,-0.71 -8.528,-2.108 0.14,0.042 0.22,0.064 0.22,0.064 0,0 0.816,-0.212 1.937,-0.621 2.126,0.845 4.263,1.281 6.371,1.281 0.203,0 0.404,-0.014 0.573,-0.053 C 0.385,-1.018 0.213,-0.426 0,0"/></g><g transform="translate(9.1875,27.9644)" id="g80"><path id="path82" style="fill:#cbb7ea;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.477,1.586 7.101,3.872 12.342,4.784 11.547,5.02 10.796,5.036 9.938,5.036 l -1.765,0 C 5.448,3.977 3.021,3.179 1.15,2.149 0.615,1.47 0.216,0.834 0,0"/></g><g transform="translate(18.1123,30.1131)" id="g84"><path id="path86" style="fill:#ffd983;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c 0.887,0 1.612,-0.726 1.612,-1.612 l 0,-1.651 C 1.612,-4.15 0.887,-4.875 0,-4.875 l 0,0 c -0.887,0 -1.612,0.725 -1.612,1.612 l 0,1.651 C -1.612,-0.726 -0.887,0 0,0"/></g><g transform="translate(18.1123,29.1099)" id="g88"><path id="path90" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c 0.484,0 0.881,-0.396 0.881,-0.881 l 0,-1.107 C 0.881,-2.473 0.484,-2.869 0,-2.869 l 0,0 c -0.484,0 -0.881,0.396 -0.881,0.881 l 0,1.107 C -0.881,-0.396 -0.484,0 0,0"/></g><g transform="translate(26.5459,15.8408)" id="g92"><path id="path94" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.032,0.204 -0.107,0.396 -0.312,0.428 -0.521,0.467 -0.709,0.319 -0.74,0.115 -0.751,0.051 -1.812,-6.135 -7.971,-6.51 c 0.11,0.968 -0.079,1.805 -0.088,1.846 -0.064,0.269 -0.334,0.44 -0.602,0.372 -0.268,-0.063 -0.435,-0.332 -0.372,-0.601 0.002,-0.008 0.178,-0.783 0.052,-1.627 -6.269,0.28 -7.328,6.37 -7.37,6.636 -0.033,0.204 -0.224,0.344 -0.429,0.312 -0.204,-0.032 -0.344,-0.224 -0.312,-0.428 0.008,-0.049 0.567,-3.305 3.132,-5.45 0.008,-0.017 0.026,-0.04 0.07,-0.078 0.749,-0.647 3.924,-3.988 5.34,-4.061 l 0,-0.002 c 0.001,0 0.003,10e-4 0.004,10e-4 10e-4,0 0.002,-10e-4 0.004,-10e-4 l 0,0.002 c 1.416,0.073 4.591,3.414 5.339,4.061 0.044,0.037 0.062,0.06 0.07,0.077 C -0.567,-3.306 -0.007,-0.049 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#88C9F9" d="M32 36v-2c0-3.313-2.687-6-6-6H10c-3.313 0-6 2.687-6 6v2h28z"/><path fill="#88C9F9" d="M13.64 28.101c1.744 1.267 2.849 3.728 4.36 3.728 1.511 0 2.616-2.462 4.36-3.728V24.29h-8.72v3.811zm-2.196-12.166c0 1.448-.734 2.622-1.639 2.622C8.9 18.558 8 17.448 8 16c0-1.935.501-2.687 1.806-2.687.905 0 1.638 1.174 1.638 2.622zM28 16c0 1.448-.9 2.558-1.806 2.558-.905 0-1.639-1.174-1.639-2.622s.734-2.623 1.639-2.623c1.352 0 1.806.752 1.806 2.687z"/><path fill="#88C9F9" d="M9.478 16.96C9.478 11.371 11 5 18 5s8.522 6.371 8.522 11.96C26.522 22 24 27.08 18 27.08S9.478 22 9.478 16.96z"/><path fill="#662113" d="M21.703 16.908h-.145c-.459 0-.835-.376-.835-.835V15.02c0-.459.376-.835.835-.835h.145c.459 0 .835.376.835.835v1.053c0 .459-.375.835-.835.835zm-7.406 0h.145c.459 0 .835-.376.835-.835V15.02c0-.459-.376-.835-.835-.835h-.145c-.459 0-.835.376-.835.835v1.053c0 .459.375.835.835.835z"/><path fill="#269" d="M18.007 23.802c2.754 0 3.6-.706 3.741-.848.256-.256.256-.671 0-.927-.248-.248-.645-.255-.902-.024-.052.038-.721.487-2.839.487-2.2 0-2.836-.485-2.842-.49-.255-.255-.656-.243-.913.013-.256.256-.242.684.014.94.141.143.987.849 3.741.849z"/><path fill="#55ACEE" d="M18.75 19.75h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75z"/><path fill="#744EAA" d="M12.016 27.95s-.157 6.817 3.987 6.817V36H8.984S8.77 30.076 10 28l2.016-.05zm11.955 0s.157 6.817-3.987 6.817V36h7.019s.214-5.924-1.016-8l-2.016-.05zM18 8.934s7.149 1.858 8.245 5.204c.478-1.021.755-3.257.755-4.518C27 5.781 24 3 19.125 3h-2.25C12.75 3 9 5.781 9 9.62c0 1.262.277 3.664.754 4.684C10.851 10.957 18 8.934 18 8.934z"/><g fill="#CBB7EA"><path d="M26.985 10.177c-1.396-1.115-3.044-2.037-4.612-2.559-.365-.122-.755.076-.876.437-.121.363.075.755.438.876 1.666.555 3.495 1.666 4.882 2.935.09-.623.151-1.328.168-1.689zM9.117 11.311c2.007-1.436 8.723-5.759 16.398-5.819-.473-.545-.984-.937-1.579-1.308-6.706.498-12.428 3.839-14.931 5.522.01.455.046 1.013.112 1.605z"/><path d="M26.421 6.89c-.028-.004-.084 0-.113 0-2.835 0-5.703.71-8.528 2.108.139-.042.22-.064.22-.064s.815.212 1.937.621c2.126-.845 4.263-1.28 6.371-1.28.203 0 .404.014.573.052-.075-.419-.248-1.011-.46-1.437zM9.188 8.036c2.477-1.586 7.101-3.872 12.342-4.784C20.734 3.016 19.983 3 19.125 3H17.36c-2.725 1.059-5.152 1.857-7.022 2.887-.536.678-.934 1.314-1.15 2.149z"/></g><path fill="#FFD983" d="M18.112 5.887c.887 0 1.612.726 1.612 1.612V9.15c0 .887-.726 1.612-1.612 1.612-.887 0-1.612-.726-1.612-1.612V7.499c0-.887.726-1.612 1.612-1.612z"/><path fill="#FFAC33" d="M18.112 6.89c.484 0 .881.396.881.881v1.108c0 .484-.396.881-.881.881-.484 0-.881-.396-.881-.881V7.771c.001-.485.397-.881.881-.881z"/><path d="M26.546 20.159c.032-.204-.107-.396-.312-.428-.209-.039-.396.108-.428.312-.01.064-1.072 6.251-7.231 6.625.111-.968-.078-1.805-.088-1.846-.063-.27-.334-.44-.602-.372-.269.063-.435.332-.372.601.002.009.178.784.052 1.627-6.269-.28-7.328-6.37-7.37-6.636-.033-.204-.224-.344-.429-.312-.204.032-.344.224-.312.428.008.049.567 3.305 3.133 5.45.007.017.026.04.07.078.749.646 3.923 3.988 5.34 4.061v.001l.004-.001.004.001v-.001c1.416-.073 4.591-3.415 5.34-4.061.043-.037.062-.06.07-.077 2.564-2.144 3.124-5.401 3.131-5.45z"/></svg> \ No newline at end of file |