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/1f956.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/1f956.svg')
-rw-r--r-- | public/emoji/1f956.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f956.svg b/public/emoji/1f956.svg index 4e00b5746..8da10427f 100644 --- a/public/emoji/1f956.svg +++ b/public/emoji/1f956.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 24.052,31.33 5.126,12.406 C 1.342,8.62 1.288,4.133 2.856,2.564 l 0,0 C 4.424,0.997 8.912,1.049 12.697,4.835 l 0,0 18.925,18.924 c 3.784,3.785 3.837,8.273 2.269,9.841 l 0,0 c -0.605,0.606 -1.647,0.969 -2.915,0.969 l 0,0 c -2.014,0 -4.602,-0.917 -6.924,-3.239"/></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(12.6968,4.835)" id="g20"><path id="path22" style="fill:#edb980;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -3.785,-3.785 -8.273,-3.838 -9.841,-2.271 -1.568,1.569 -1.514,6.056 2.271,9.841 l 18.925,18.925 c 3.785,3.784 8.271,3.838 9.84,2.27 1.567,-1.568 1.514,-6.056 -2.271,-9.841 L 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(27.917,25.9487)" id="g32"><path id="path34" style="fill:#e5a157;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.837,-0.835 -2.026,0.514 -3.595,2.082 -5.163,3.65 -6.513,4.841 -5.677,5.677 -4.842,6.513 -2.893,5.921 -1.325,4.353 0.243,2.785 0.837,0.836 0,0"/></g><g transform="translate(22.998,32.3833)" id="g36"><path id="path38" style="fill:none;stroke:#ffd983;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.701,-0.19 5.485,-3.974 5.676,-5.678"/></g><g transform="translate(23.376,21.4072)" id="g40"><path id="path42" style="fill:#e5a157;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.837,-0.835 -2.028,0.514 -3.597,2.082 -5.164,3.649 -6.514,4.841 -5.678,5.677 -4.843,6.513 -2.893,5.921 -1.324,4.352 0.243,2.785 0.835,0.836 0,0"/></g><g transform="translate(18.4551,27.8413)" id="g44"><path id="path46" style="fill:none;stroke:#ffd983;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.703,-0.189 5.488,-3.974 5.678,-5.678"/></g><g transform="translate(18.834,16.8662)" id="g48"><path id="path50" style="fill:#e5a157;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.836,-0.837 -2.028,0.513 -3.595,2.081 -5.164,3.649 -6.514,4.84 -5.678,5.676 -4.841,6.512 -2.893,5.92 -1.325,4.351 0.243,2.783 0.837,0.835 0,0"/></g><g transform="translate(13.9136,23.2998)" id="g52"><path id="path54" style="fill:none;stroke:#ffd983;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.703,-0.189 5.488,-3.975 5.677,-5.677"/></g><g transform="translate(14.2925,12.3232)" id="g56"><path id="path58" style="fill:#e5a157;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.836,-0.837 -2.028,0.515 -3.596,2.082 -5.165,3.65 -6.513,4.842 -5.678,5.679 -4.842,6.513 -2.893,5.921 -1.325,4.354 0.243,2.785 0.835,0.837 0,0"/></g><g transform="translate(9.3721,18.7578)" id="g60"><path id="path62" style="fill:none;stroke:#ffd983;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.703,-0.188 5.488,-3.975 5.677,-5.678"/></g><g transform="translate(9.7505,7.7822)" id="g64"><path id="path66" style="fill:#e5a157;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.836,-0.837 -2.028,0.514 -3.596,2.082 -5.165,3.649 -6.513,4.842 -5.678,5.677 -4.841,6.513 -2.893,5.92 -1.325,4.352 0.243,2.783 0.836,0.835 0,0"/></g><g transform="translate(4.8301,14.2158)" id="g68"><path id="path70" style="fill:none;stroke:#ffd983;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="M 0,0 C 1.703,-0.189 5.488,-3.974 5.677,-5.677"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EDB980" d="M12.697 31.165c-3.785 3.785-8.273 3.838-9.841 2.271-1.568-1.568-1.514-6.056 2.271-9.841L24.052 4.67c3.785-3.784 8.271-3.838 9.84-2.271 1.567 1.568 1.515 6.056-2.271 9.841L12.697 31.165z"/><path d="M24.322 7.969c1.568 1.568 2.758 2.917 3.595 2.082.152-.152.241-.349.301-.565-.018-.043-.036-.087-.041-.136-.128-1.148-2.41-3.641-4.08-4.721l-.045.042-1.474 1.474c.438.539 1.064 1.144 1.744 1.824zm-4.543 4.542c1.568 1.568 2.76 2.917 3.597 2.082.152-.152.241-.35.301-.567-.018-.043-.036-.086-.041-.135-.127-1.148-2.411-3.643-4.083-4.722l-1.517 1.517c.437.54 1.063 1.145 1.743 1.825zm-4.54 4.542c1.567 1.568 2.759 2.918 3.595 2.081.152-.152.241-.349.301-.565-.018-.043-.036-.087-.042-.136-.128-1.148-2.412-3.642-4.083-4.721l-1.517 1.517c.439.539 1.065 1.144 1.746 1.824zm-4.542 4.542c1.567 1.567 2.759 2.919 3.596 2.082.152-.152.241-.35.301-.566-.018-.043-.036-.087-.042-.136-.127-1.148-2.411-3.643-4.082-4.722L8.953 19.77c.437.54 1.063 1.145 1.744 1.825zm-4.542 4.541c1.567 1.568 2.759 2.919 3.596 2.082.152-.152.241-.35.301-.566-.018-.043-.036-.086-.042-.135-.128-1.148-2.412-3.643-4.083-4.722l-.801.801c-.246.246-.475.496-.691.747.437.532 1.053 1.126 1.72 1.793z" fill="#E5A157"/><path d="M24.859 3.932c-.126.106-.634.569-.762.696 1.67 1.08 3.952 3.574 4.08 4.721.005.049.023.093.042.136.077.182.252.309.455.309l.057-.003c.274-.031.472-.278.441-.553-.164-1.452-2.382-4-4.313-5.306zm-4.583 4.514l-.724.724c1.671 1.079 3.956 3.574 4.083 4.722.005.049.023.092.041.135.076.183.252.31.455.31l.057-.003c.274-.031.472-.278.441-.552-.162-1.464-2.411-4.04-4.353-5.336zm-4.541 4.541l-.724.724c1.671 1.079 3.955 3.574 4.083 4.721.005.049.023.093.042.136.077.182.252.309.454.309l.057-.003c.274-.031.472-.278.441-.552-.163-1.463-2.412-4.038-4.353-5.335zm-4.542 4.541l-.724.724c1.671 1.079 3.955 3.574 4.082 4.722.005.049.023.093.042.136.077.183.252.309.455.309l.056-.003c.274-.03.472-.277.442-.552-.163-1.463-2.411-4.039-4.353-5.336zm-4.542 4.543l-.724.724c1.671 1.079 3.955 3.574 4.083 4.722.005.049.023.092.042.135.077.182.252.309.455.309.019 0 .037-.001.056-.003.274-.03.472-.278.442-.553-.164-1.462-2.413-4.038-4.354-5.334z" fill="#FFD983"/></svg> \ No newline at end of file |