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/1f933-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/1f933-1f3ff.svg')
-rw-r--r-- | public/emoji/1f933-1f3ff.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f933-1f3ff.svg b/public/emoji/1f933-1f3ff.svg index 8badf905f..1cad7851a 100644 --- a/public/emoji/1f933-1f3ff.svg +++ b/public/emoji/1f933-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(28.3837,29.2466)" id="g20"><path id="path22" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -2.42,0.003 -2.697,-1.999 l -1.299,-9.659 c -0.372,-2.182 2.132,-2.637 3.64,-2.668 1.506,-0.032 2.761,1.112 2.8,2.555 l 0.104,3.046 0.153,4.488 0.046,1.449 C 2.747,-1.579 2.226,-0.288 0,0"/></g><g transform="translate(30.1458,25.561)" id="g24"><path id="path26" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.159,0.007 C -0.633,0.026 -1.037,-0.346 -1.057,-0.82 L -1.13,-3.327 0.635,-3.655 0.767,-0.551 C 0.646,-0.242 0.352,-0.014 0,0"/></g><g transform="translate(29.25,14.0937)" id="g28"><path id="path30" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -3.594,0 -0.5,1.656 4.594,0 L 0,0 Z"/></g><g transform="translate(20.4241,28.4945)" id="g32"><path id="path34" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.144,0.764 1.347,0.68 L 1.015,-0.37 0,0 Z"/></g><g transform="translate(29,33.6348)" id="g36"><path id="path38" style="fill:#6d6e71;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.754 -0.611,1.365 -1.365,1.365 l -4.27,0 C -6.389,1.365 -7,0.754 -7,0 l 0,-15.27 c 0,-0.754 2.611,-1.365 3.365,-1.365 l 2.27,0 c 0.754,0 1.365,0.611 1.365,1.365 L 0,0 Z"/></g><g transform="translate(28,33.6348)" id="g40"><path id="path42" style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.754 -0.611,1.365 -1.365,1.365 l -4.27,0 C -6.389,1.365 -7,0.754 -7,0 l 0,-15.27 c 0,-0.754 0.611,-1.365 1.365,-1.365 l 4.27,0 c 0.754,0 1.365,0.611 1.365,1.365 L 0,0 Z"/></g><path id="path44" style="fill:#88c9f9;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 22,20 5,0 0,13 -5,0 0,-13 z"/><g transform="translate(20.5464,21.8635)" id="g46"><path id="path48" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.131,-0.745 0.536,0.045 0.599,0.043 c 0.49,0.034 0.884,0.37 1.022,0.812 L 0,0 Z"/></g><g transform="translate(20.5461,24.2552)" id="g50"><path id="path52" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.02,-0.73 0.651,0.007 c 0.526,0.015 0.967,0.334 1.172,0.782 L 0,0 Z"/></g><g transform="translate(20.536,26.9047)" id="g54"><path id="path56" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.011,-0.717 0.223,-0.031 c 0.524,-0.037 0.995,0.238 1.242,0.664 L 0,0 Z"/></g><g transform="translate(30.4039,24.1419)" id="g58"><path id="path60" style="fill:#583529;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.144,-0.067 C -0.574,-0.269 -1.09,-0.081 -1.292,0.348 L -2.055,1.98 c -0.201,0.43 -0.014,0.946 0.416,1.147 l 0.144,0.068 c 0.43,0.201 0.946,0.014 1.147,-0.416 L 0.416,1.147 C 0.617,0.718 0.43,0.201 0,0"/></g><g transform="translate(29.3262,19.8325)" id="g62"><path id="path64" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.159,0.007 C -0.633,0.026 -1.005,0.43 -0.986,0.904 l 0.162,3.936 c 0.02,0.474 0.424,0.846 0.898,0.827 L 0.233,5.66 C 0.707,5.641 1.079,5.237 1.06,4.762 L 0.898,0.827 C 0.878,0.353 0.474,-0.02 0,0"/></g><g transform="translate(29.8852,24.085)" id="g66"><path id="path68" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -0.144,-0.067 C -0.574,-0.269 -1.09,-0.081 -1.292,0.348 L -2.055,1.98 c -0.201,0.43 -0.014,0.946 0.416,1.147 l 0.144,0.068 c 0.43,0.201 0.946,0.014 1.147,-0.416 L 0.416,1.147 C 0.617,0.718 0.43,0.201 0,0"/></g><g transform="translate(30.8179,22.2202)" id="g70"><path id="path72" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.785,0.332 -1.639,0.124 -1.974,-0.114 -2.887,-2.043 -2.463,-5.208 -0.448,-5.645 1.63,-0.353 2.182,0.789 2.182,0.789 L -0.058,-1.699 0,0 Z"/></g><g transform="translate(20.7182,24.0984)" id="g74"><path id="path76" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.06,-0.002 c -0.181,-0.005 -0.333,0.139 -0.338,0.319 l -0.041,1.477 c -0.005,0.18 0.138,0.332 0.319,0.337 l 0.06,0.002 C 0.121,2.138 0.272,1.994 0.277,1.814 L 0.319,0.337 C 0.324,0.157 0.18,0.005 0,0"/></g><g transform="translate(20.6949,21.6307)" id="g78"><path id="path80" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 1.486,0.105 c 0,0 0.378,0.029 0.653,0.283 0.173,0.159 0.305,0.405 0.278,0.79 C 2.346,2.18 1.344,2.109 1.344,2.109 L 0.94,2.081 0.342,2.039 -0.142,2.004 0,0 Z"/></g><g transform="translate(20.7134,21.632)" id="g82"><path id="path84" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.037,-0.003 c -0.175,-0.012 -0.328,0.121 -0.341,0.296 l -0.097,1.368 c -0.012,0.175 0.121,0.328 0.296,0.341 l 0.037,0.002 C 0.033,2.017 0.186,1.884 0.199,1.709 L 0.296,0.341 C 0.308,0.166 0.175,0.012 0,0"/></g><g transform="translate(20.8462,21.2102)" id="g86"><path id="path88" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.187,-1.693 0.572,0.049 c 0,0 0.291,0.037 0.513,0.236 0.156,0.139 0.278,0.355 0.24,0.704 C 1.418,0.142 0.571,0.049 0.571,0.049 L 0,0 Z"/></g><g transform="translate(21.0492,19.5195)" id="g90"><path id="path92" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.031,-0.004 c -0.147,-0.021 -0.285,0.082 -0.306,0.23 l -0.162,1.151 c -0.021,0.147 0.083,0.284 0.23,0.305 l 0.031,0.005 c 0.147,0.02 0.285,-0.083 0.306,-0.23 L 0.23,0.306 C 0.251,0.158 0.147,0.021 0,0"/></g><g transform="translate(21.3389,26.6516)" id="g94"><path id="path96" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.358,-0.018 0.673,0.169 0.901,0.304 1.107,0.544 1.138,0.99 1.212,2.054 0.148,2.128 0.148,2.128 L -0.384,2.165 -0.532,2.176 -0.68,0.047 0,0 Z"/></g><g transform="translate(20.6887,26.6968)" id="g98"><path id="path100" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.06,0.004 c -0.18,0.013 -0.317,0.17 -0.305,0.35 l 0.102,1.474 c 0.013,0.18 0.171,0.317 0.351,0.304 L 0.148,2.128 C 0.328,2.116 0.465,1.958 0.452,1.778 L 0.35,0.305 C 0.338,0.125 0.18,-0.013 0,0"/></g><g transform="translate(21.7355,24.1269)" id="g102"><path id="path104" style="fill:#7c533e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 0.358,0.017 0.653,0.234 0.867,0.391 1.049,0.649 1.036,1.096 1.006,2.162 -0.06,2.133 -0.06,2.133 L -0.593,2.118 -1.107,2.103 -1.048,-0.029 0,0 Z"/></g><g transform="translate(29.25,15)" id="g106"><path id="path108" style="fill:#5c913b;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -3.792,0 C -4.203,0 -4.375,-0.203 -4.99,-1.211 l -4.382,-6.699 -13.378,3.039 0,-10.129 16.365,0 c 1.333,0 2.533,0.307 3.035,1.542 L 1.283,-1.832 C 1.708,-0.5 0.947,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#7C533E" d="M28.384 6.753s-2.42-.003-2.697 1.999l-1.3 9.659c-.372 2.182 2.133 2.637 3.64 2.668 1.507.031 2.761-1.113 2.801-2.556l.104-3.046.153-4.488.045-1.449c0-1.208-.521-2.498-2.746-2.787z"/><path fill="#583529" d="M30.146 10.439l-.159-.007c-.474-.019-.878.353-.898.827l-.073 2.506 1.766.328.132-3.103c-.122-.309-.416-.537-.768-.551z"/><path fill="#7C533E" d="M29.25 21.906h-3.594l-.5-1.656h4.594zm-8.826-14.4s.144-.764 1.347-.68l-.332 1.051-1.015-.371z"/><path fill="#6D6E71" d="M29 2.365C29 1.611 28.389 1 27.635 1h-4.27C22.611 1 22 1.611 22 2.365v15.27C22 18.389 24.611 19 25.365 19h2.27c.754 0 1.365-.611 1.365-1.365V2.365z"/><path fill="#231F20" d="M28 2.365C28 1.611 27.389 1 26.635 1h-4.27C21.611 1 21 1.611 21 2.365v15.27c0 .754.611 1.365 1.365 1.365h4.27c.754 0 1.365-.611 1.365-1.365V2.365z"/><path fill="#88C9F9" d="M22 3h5v13h-5z"/><path fill="#583529" d="M20.546 14.136l.131.745.537-.045.599-.042c.49-.035.884-.37 1.022-.812l-2.289.154zm0-2.391l.02.73.651-.007c.525-.015.967-.334 1.172-.782l-1.843.059zm-.01-2.65l.011.717.223.031c.524.036.995-.238 1.242-.664l-1.476-.084zm9.868 2.763l-.144.067c-.43.201-.946.014-1.147-.416l-.763-1.631c-.201-.43-.014-.946.416-1.147l.144-.067c.43-.201.946-.014 1.147.416l.763 1.631c.201.43.014.946-.416 1.147z"/><path fill="#7C533E" d="M29.326 16.167l-.159-.007c-.474-.02-.846-.424-.827-.898l.162-3.936c.02-.474.424-.846.898-.827l.159.007c.474.02.846.424.827.898l-.162 3.936c-.019.475-.423.847-.898.827z"/><path fill="#7C533E" d="M29.885 11.915l-.144.067c-.43.201-.946.014-1.147-.416l-.764-1.631c-.201-.43-.014-.946.416-1.147l.144-.068c.43-.201.946-.014 1.147.416l.763 1.631c.202.43.015.947-.415 1.148zm.933 1.865c-.785-.332-1.639-.124-1.974.114-2.887 2.044-2.462 5.208-.448 5.645 1.63.353 2.182-.789 2.182-.789l.182-3.272.058-1.698zm-10.1-1.878l-.06.002c-.18.005-.332-.138-.337-.319l-.041-1.477c-.005-.18.138-.332.319-.337l.06-.002c.18-.005.332.138.337.319l.041 1.477c.005.18-.138.332-.319.337z"/><g fill="#7C533E"><path d="M20.695 14.369l1.486-.105s.378-.029.654-.283c.172-.159.305-.405.277-.79-.071-1.002-1.073-.931-1.073-.931l-.403.029-.599.042-.483.034.141 2.004z"/><path d="M20.713 14.368l-.037.003c-.175.012-.328-.121-.341-.296l-.097-1.368c-.012-.175.121-.328.296-.341l.037-.003c.175-.012.328.121.341.296l.097 1.368c.012.175-.121.329-.296.341z"/></g><g fill="#7C533E"><path d="M20.846 14.79l.187 1.693.571-.049s.291-.037.513-.236c.156-.139.278-.356.24-.704-.094-.846-.94-.753-.94-.753l-.571.049z"/><path d="M21.049 16.481l-.031.004c-.147.021-.285-.083-.306-.23l-.162-1.151c-.021-.147.083-.285.23-.306l.031-.004c.147-.021.285.083.306.23l.162 1.151c.021.147-.083.285-.23.306z"/></g><g fill="#7C533E"><path d="M21.339 9.348s.358.018.673-.169c.228-.135.434-.375.465-.821.074-1.064-.99-1.138-.99-1.138l-.532-.037-.148-.01-.148 2.128.68.047z"/><path d="M20.689 9.303l-.06-.004c-.18-.013-.317-.17-.305-.35l.102-1.474c.013-.18.17-.317.35-.305l.06.004c.18.013.317.17.305.35l-.102 1.474c-.013.181-.17.318-.35.305z"/></g><path fill="#7C533E" d="M21.735 11.873s.358-.017.653-.234c.214-.157.396-.415.383-.862-.03-1.066-1.096-1.036-1.096-1.036l-.533.015-.514.014.06 2.133 1.047-.03z"/><path fill="#5C913B" d="M29.25 21h-3.792c-.411 0-.583.203-1.198 1.211l-4.382 6.699L6.5 25.871V36h16.365c1.333 0 2.533-.307 3.035-1.542l4.633-11.626C30.958 21.5 30.197 21 29.25 21z"/></svg> \ No newline at end of file |