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/1f931-1f3fb.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/1f931-1f3fb.svg')
| -rw-r--r-- | public/emoji/1f931-1f3fb.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f931-1f3fb.svg b/public/emoji/1f931-1f3fb.svg index 988b5d57d..e4815f2a5 100644 --- a/public/emoji/1f931-1f3fb.svg +++ b/public/emoji/1f931-1f3fb.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(24.0531,19.2222)" id="g20"><path id="path22" style="fill:#9268ca;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.282,0 c -1.793,0 -4.416,-1.504 -5.471,-2.451 -0.952,-0.856 -4.245,-3.302 -4.245,-5.802 0,-4.716 5.221,-10.969 5.221,-10.969 l 10.111,0 c 0,0 2,8.719 2,15.889 C 3.334,-1.597 1.793,0 0,0"/></g><g transform="translate(22.5382,18.5073)" id="g24"><path id="path26" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.178,-1.084 -1.277,-3.246 -4.038,-6.007 -2.5,-2.5 -5.5,-3 -5.5,-3 0,0 -3.457,-0.765 -2.703,2.25 0.44,1.762 2.616,1.833 4.156,3.922 1.545,2.096 4.842,3.087 6.047,3.328 C 0.462,0.993 0,0 0,0"/></g><g transform="translate(14.4353,11.9176)" id="g28"><path id="path30" style="fill:#e0aa94;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.712,-0.558 -1.376,-0.494 -1.859,-0.094 -0.796,0.66 -2.004,0.693 -2.092,0.426 0.023,-1.026 1.116,-1.483 1.316,-2.556 0.007,-0.037 0.018,-0.074 0.026,-0.111 0.567,-0.192 1.174,-0.083 1.174,-0.083 0,0 0.572,0.111 1.138,0.31 0.719,2.353 1.71,2.341 2.065,3.143 C 1.887,1.305 0.606,0.475 0,0"/></g><g transform="translate(15.2455,29.9963)" id="g32"><path id="path34" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.724,-1.74 -0.09,-3.73 -1.817,-4.447 -1.728,-0.717 -3.713,0.109 -4.435,1.849 -0.723,1.739 0.09,3.73 1.819,4.447 C -2.706,2.567 -0.721,1.74 0,0"/></g><g transform="translate(18.1133,20.7389)" id="g36"><path id="path38" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.639,-2.538 c 0.258,-1.026 0.069,-1.856 1.581,-1.914 1.056,-0.041 2.483,1.846 2.225,2.873 L 3.807,0.959 0,0 Z"/></g><g transform="translate(18.1133,20.7389)" id="g40"><path id="path42" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.734,-2.994 C 3.866,-1.655 3.97,0.725 3.97,0.725 L 0,0 Z"/></g><g transform="translate(12.6221,31.2415)" id="g44"><path id="path46" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.356,-3.263 -1.556,-4.926 l 1.549,-3.728 c 1.27,-3.053 3,-5.239 6.056,-3.969 3.057,1.271 6.279,5.514 5.009,8.566 L 9.777,-0.971 C 2.85,-3.579 0,0 0,0"/></g><g transform="translate(13.6985,21.237)" id="g48"><path id="path50" style="fill:#bf6952;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -0.387,-0.161 c -0.17,-0.07 -0.365,0.008 -0.436,0.18 -0.069,0.17 0.011,0.364 0.18,0.434 l 0.388,0.162 C -0.084,0.686 0.11,0.605 0.181,0.435 0.251,0.264 0.17,0.072 0,0"/></g><g transform="translate(13.8887,23.8378)" id="g52"><path id="path54" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.339,-0.141 -0.729,0.021 -0.87,0.359 l -0.257,0.617 c -0.141,0.337 0.022,0.729 0.361,0.869 0.34,0.142 0.73,-0.021 0.871,-0.358 L 0.361,0.871 C 0.502,0.532 0.342,0.141 0,0"/></g><g transform="translate(14.2254,19.728)" id="g56"><path id="path58" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.306,-0.37 0.64,-0.68 1,-0.921 1.326,0.765 1.419,1.926 1.419,1.926 0,0 -1.177,-0.489 -2.355,-0.979 C 0.04,0.017 0.023,0.01 0,0"/></g><g transform="translate(18.112,23.99)" id="g60"><path id="path62" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.833,2.954 c 0,0 -5.064,-1.243 -6.58,1.649 -1.517,2.891 2.347,5.581 4.945,6.495 2.599,0.914 6.774,2.009 9.333,-3.262 2.37,-4.881 -0.68,-9.096 -1.571,-10.228 0,0 -1.296,1.013 -1.67,1.752 C 2.249,0.098 2.795,1.972 1.973,2.556 1.193,3.11 -0.494,2.543 0,0"/></g><g transform="translate(23.3057,30.7583)" id="g64"><path id="path66" style="fill:#292f33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.682,1.427 1.115,3.782 3.234,3.566 5.354,3.351 7.845,1.248 6.81,-1.519 5.821,-4.164 6.563,-6.2 8.611,-6.132 c 0,0 -1.172,-1.614 -3.168,-0.44 C 3.36,-5.347 4.54,-1.473 3.042,-0.696 2.29,-0.304 1.293,-0.191 0.892,-0.661 0.492,-1.132 0,0 0,0"/></g><g transform="translate(16.5179,3.6327)" id="g68"><path id="path70" style="fill:#77b255;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.105,-0.007 3.938,0.359 5.817,0.824 -1.458,0.994 -4.946,3.342 -6.46,4.075 -1.937,0.937 -5.562,4.062 -6.281,4.812 -0.719,0.75 -2.438,0.625 -3.34,-0.687 -0.641,-0.933 -1.499,-4.347 -0.004,-7.094 1.747,-3.212 4.769,-5.54 8.744,-5.54 1.05,0 1.979,0.134 2.801,0.348 C -0.976,-3.043 -1.329,0.008 0,0"/></g><g transform="translate(18,0)" id="g72"><path id="path74" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -2.565,0 c -2.094,0 -4.81,1.656 -4.369,3.156 0.44,1.495 1.654,0.486 3.434,0.486 1,0 2.018,-0.009 2.018,-0.009 0,0 0.8,-2.457 1.482,-3.633"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9268CA" d="M24.053 16.778h-4.282c-1.793 0-4.416 1.504-5.47 2.451-.953.856-4.246 3.302-4.246 5.802 0 4.716 5.221 10.969 5.221 10.969h10.111s2-8.719 2-15.889c0-1.736-1.541-3.333-3.334-3.333z"/><path fill="#F7DECE" d="M22.538 17.493c-.178 1.084-1.277 3.246-4.038 6.007-2.5 2.5-5.5 3-5.5 3s-3.457.765-2.703-2.25c.44-1.762 2.616-1.833 4.156-3.922 1.545-2.096 4.842-3.087 6.047-3.328 2.5-.5 2.038.493 2.038.493z"/><path fill="#E0AA94" d="M14.435 24.082c-.712.558-1.376.494-1.859.094-.796-.66-2.004-.693-2.092-.426.023 1.026 1.116 1.483 1.316 2.556.007.037.018.074.027.112.566.192 1.173.082 1.173.082s.572-.111 1.139-.309c.719-2.353 1.709-2.342 2.065-3.144.119-.27-1.163.56-1.769 1.035z"/><path fill="#292F33" d="M15.245 6.004c.724 1.74-.09 3.73-1.817 4.446-1.728.718-3.714-.109-4.436-1.849-.723-1.739.091-3.73 1.819-4.447 1.728-.717 3.714.11 4.434 1.85z"/><path fill="#F7DECE" d="M18.113 15.261l.639 2.538c.258 1.026.069 1.857 1.581 1.915 1.056.04 2.483-1.846 2.225-2.873l-.638-2.538-3.807.958z"/><path fill="#EEC2AD" d="M18.113 15.261l.734 2.994c3.132-1.339 3.236-3.719 3.236-3.719l-3.97.725z"/><path fill="#F7DECE" d="M12.622 4.758s1.356 3.263-1.556 4.926l1.549 3.728c1.27 3.052 3 5.239 6.056 3.968 3.057-1.27 6.278-5.513 5.008-8.565l-1.281-3.086c-6.926 2.608-9.776-.971-9.776-.971z"/><path fill="#BF6952" d="M13.699 14.763l-.387.161c-.17.07-.365-.008-.436-.18-.069-.17.01-.364.179-.434l.388-.161c.171-.072.366.01.436.179.071.171-.011.363-.18.435z"/><path fill="#662113" d="M13.889 12.162c-.339.141-.729-.021-.87-.359l-.257-.616c-.141-.337.021-.729.361-.869.34-.142.731.021.871.358l.256.616c.14.338-.02.729-.361.87z"/><path fill="#DF1F32" d="M14.225 16.272c.306.37.64.68 1 .921 1.326-.765 1.418-1.926 1.418-1.926l-2.355.979-.063.026z"/><path fill="#292F33" d="M18.112 12.01l-1.833-2.954s-5.064 1.243-6.58-1.649C8.183 4.516 12.047 1.826 14.645.912c2.598-.915 6.773-2.009 9.332 3.261 2.37 4.882-.68 9.096-1.57 10.228 0 0-1.297-1.013-1.671-1.751-.374-.739.172-2.612-.65-3.196-.781-.554-2.468.014-1.974 2.556z"/><path fill="#292F33" d="M23.306 5.242c-.682-1.427 1.115-3.782 3.234-3.566 2.12.215 4.612 2.319 3.576 5.085-.989 2.645-.247 4.682 1.801 4.613 0 0-1.172 1.615-3.168.44-2.083-1.225-.903-5.099-2.401-5.876-.752-.391-1.749-.505-2.151-.034-.399.47-.891-.662-.891-.662z"/><path fill="#77B255" d="M16.518 32.367c1.105.007 3.938-.359 5.817-.824-1.457-.994-4.946-3.342-6.46-4.075-1.938-.938-5.562-4.062-6.281-4.812s-2.438-.625-3.34.687c-.641.933-1.499 4.346-.004 7.094 1.747 3.212 4.769 5.539 8.744 5.539 1.05 0 1.978-.134 2.801-.348-2.253-.218-2.606-3.269-1.277-3.261z"/><path fill="#F7DECE" d="M18 36h-2.565c-2.094 0-4.81-1.656-4.368-3.156.44-1.495 1.654-.486 3.434-.486 1 0 2.018.01 2.018.01S17.318 34.824 18 36z"/></svg> \ No newline at end of file |
