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/270c-1f3fd.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/270c-1f3fd.svg')
| -rw-r--r-- | public/emoji/270c-1f3fd.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/270c-1f3fd.svg b/public/emoji/270c-1f3fd.svg index 1a814abd8..b00e6af96 100644 --- a/public/emoji/270c-1f3fd.svg +++ b/public/emoji/270c-1f3fd.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(8.916,12.1094)" id="g20"><path id="path22" style="fill:#aa8052;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.737,-0.109 1.94,1.808 l 0.016,4.161 0.128,0.005 0,0.96 c 0,0.952 0.572,1.768 1.389,2.132 C 3.231,8.736 3.19,1.891 3.19,1.891 3.19,0.786 3.979,0 5.084,0 5.839,0 6.349,0.314 6.69,0.932 6.232,1.458 5.956,2.138 5.956,2.891 c 0,1.312 0.781,2.14 1.128,2.221 0,0 0.056,0.07 0.082,0.084 0.368,0.306 0.804,0.535 1.291,0.635 l 0.02,-0.002 0.26,0.155 6.928,0 c 1.307,0 1.558,-0.486 1.538,-0.475 l 0.02,-0.011 c 0.591,-0.305 1.077,-0.772 1.404,-1.35 -0.025,0.031 -0.68,0.633 -1.543,0.633 -0.863,0 -8,0.047 -8,0.047 -1.105,0 -1.925,-0.833 -1.925,-1.937 0,-1.105 0.82,-1.922 1.925,-1.922 l 5.5,0.015 c 0.276,0 0.591,-0.317 0.591,-0.593 0,-0.277 -0.315,-0.578 -0.591,-0.578 0,0 -1.558,0.069 -2.847,-1.25 -1.209,-1.238 -2.078,-3.804 -2.078,-5.672 0,-0.277 -0.299,-0.578 -0.575,-0.578 -0.276,0 -0.581,0.301 -0.581,0.578 0,3.009 0.941,5.525 2.75,6.89 l -2.169,0 c -1,0 -1.273,0.244 -1.474,0.36 10e-4,-10e-4 -0.701,-1.36 -2.526,-1.36 -0.237,0 -1.628,0.047 -2.487,1.266 -1.125,-1.422 -2.576,-1.266 -2.576,-1.266 -0.733,0 -1.565,0.328 -1.909,0.834 -0.013,0.091 -0.028,0.181 -0.028,0.276 l 0,1.917 C -1.916,0.749 -1.059,0 0,0"/></g><g transform="translate(24.5811,18)" id="g24"><path id="path26" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -6.162,0 -0.419,0 c -0.208,0 -0.411,-0.021 -0.608,-0.061 l -0.073,0.278 -3.272,12.464 c 0,0 -0.416,1.957 1.54,2.372 1.956,0.416 2.372,-1.54 2.372,-1.54 L -3.525,1.944 C -3.079,1.92 -2.647,1.881 -2.22,1.837 l 2.061,10.512 c 0,0 0.188,1.991 2.18,1.804 1.991,-0.188 1.803,-2.179 1.803,-2.179 L 1.759,0.813 1.538,-0.381 C 1.074,-0.146 0.556,0 0,0"/></g><g transform="translate(8.916,20)" id="g28"><path id="path30" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0.168,0 c 1.059,0 1.916,-0.858 1.916,-1.917 l 0,-4.083 0,-0.083 C 2.084,-7.142 1.227,-8 0.168,-8 L 0,-8 c -1.059,0 -1.916,0.858 -1.916,1.917 l 0,0.083 0,4.083 C -1.916,-0.858 -1.059,0 0,0"/></g><g transform="translate(15,15)" id="g32"><path id="path34" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,-0.753 0.287,-1.433 0.745,-1.959 0.404,-2.576 -0.245,-3 -1,-3 c -1.104,0 -2,0.896 -2,2 l 0,6 c 0,0.441 0.147,0.845 0.389,1.176 C -2.247,6.673 -1.664,7 -1,7 0.104,7 1,6.104 1,5 L 1,4.043 1,2.267 1,2.222 C 0.391,1.673 0,0.886 0,0"/></g><g transform="translate(9.0625,11)" id="g36"><path id="path38" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.024,0 1.925,0.526 2.45,1.322 2.573,1.14 2.721,0.977 2.881,0.825 2.93,0.779 2.983,0.74 3.036,0.697 3.155,0.599 3.279,0.509 3.413,0.429 3.479,0.39 3.545,0.354 3.614,0.32 3.754,0.251 3.899,0.195 4.05,0.148 4.117,0.128 4.181,0.103 4.25,0.087 4.472,0.034 4.7,0 4.937,0 5.174,0 5.398,0.036 5.618,0.089 5.694,0.106 5.767,0.131 5.841,0.155 5.977,0.199 6.109,0.254 6.236,0.316 6.318,0.356 6.399,0.393 6.477,0.44 6.641,0.54 6.795,0.653 6.937,0.781 7.139,0.965 7.32,1.168 7.467,1.399 7.466,1.4 7.465,1.401 7.464,1.402 7.665,1.287 7.937,1 8.938,1 l 2.537,0 C 9.666,-0.365 8.438,-2.99 8.438,-6 c 0,-0.276 0.223,-0.5 0.5,-0.5 0.276,0 0.5,0.224 0.5,0.5 0,3.859 2.187,7 4.875,7 l 0.125,0 c 0.276,0 0.5,0.224 0.5,0.5 0,0.276 -0.224,0.5 -0.5,0.5 l -1.5,0 -4,0 C 7.833,2 6.937,2.896 6.937,4 c 0,1.104 0.896,2 2.001,2 l 7.999,0 C 16.97,6 17,5.992 17.032,5.99 17.104,5.987 17.176,5.981 17.248,5.969 17.31,5.959 17.37,5.947 17.43,5.932 c 0.063,-0.017 0.125,-0.035 0.186,-0.058 0.062,-0.022 0.122,-0.047 0.181,-0.075 0.057,-0.027 0.111,-0.058 0.165,-0.09 0.056,-0.033 0.109,-0.067 0.161,-0.106 0.052,-0.038 0.102,-0.08 0.15,-0.124 0.046,-0.042 0.09,-0.084 0.132,-0.13 0.027,-0.029 0.051,-0.061 0.076,-0.091 0.017,-0.021 0.035,-0.041 0.052,-0.063 0.038,-0.05 0.073,-0.102 0.106,-0.156 0.034,-0.056 0.064,-0.112 0.093,-0.171 0.03,-0.061 0.056,-0.125 0.08,-0.19 0.011,-0.031 0.028,-0.06 0.039,-0.093 L 19.937,1 C 20.04,0.665 20.416,-0.871 20.348,-1.191 20.348,-6 15.652,-11 9.938,-11 3.4,-11 -1.906,-5.769 -2.049,0.734 -2.044,0.731 -2.039,0.728 -2.035,0.724 -1.52,0.279 -0.858,0 -0.125,0 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#AA8052" d="M8.916 23.891s1.737.109 1.94-1.808l.016-4.161.128-.005v-.96c0-.952.572-1.769 1.389-2.133-.242.331-.283 7.176-.283 7.176 0 1.104.789 1.891 1.894 1.891.755 0 1.265-.314 1.606-.932-.458-.526-.734-1.206-.734-1.959 0-1.312.781-2.141 1.128-2.222 0 0 .056-.07.082-.084.368-.306.804-.535 1.291-.634l.02.001.261-.155h6.928c1.306 0 1.558.486 1.538.475l.02.011c.591.305 1.076.773 1.404 1.35-.025-.031-.681-.633-1.543-.633s-8-.047-8-.047c-1.104 0-1.925.833-1.925 1.938s.82 1.922 1.925 1.922l5.5-.016c.276 0 .591.317.591.594 0 .276-.314.578-.591.578 0 0-1.558-.069-2.847 1.25-1.209 1.238-2.078 3.803-2.078 5.672 0 .276-.299.578-.575.578s-.582-.302-.582-.578c0-3.01.941-5.525 2.75-6.891H18c-1 0-1.273-.244-1.474-.359.001.001-.701 1.359-2.526 1.359-.237 0-1.628-.047-2.487-1.266-1.125 1.422-2.575 1.266-2.575 1.266-.733 0-1.566-.328-1.91-.833C7.015 24.185 7 24.095 7 24v-1.917c0 1.059.857 1.808 1.916 1.808z"/><path fill="#D5AB88" d="M24.581 18H18c-.208 0-.411.021-.607.061l-.073-.278-3.273-12.464s-.416-1.957 1.54-2.372c1.956-.416 2.372 1.54 2.372 1.54l3.097 11.569c.446.024.878.063 1.305.107l2.061-10.512s.188-1.991 2.18-1.804c1.991.188 1.803 2.179 1.803 2.179L26.34 17.187l-.221 1.194c-.464-.235-.982-.381-1.538-.381zM8.916 16h.168c1.059 0 1.916.858 1.916 1.917v4.166C11 23.142 10.143 24 9.084 24h-.168C7.857 24 7 23.142 7 22.083v-4.166C7 16.858 7.857 16 8.916 16zM15 21c0 .753.287 1.433.745 1.959C15.404 23.576 14.755 24 14 24c-1.104 0-2-.896-2-2v-6c0-.441.147-.845.389-1.176.364-.497.947-.824 1.611-.824 1.104 0 2 .896 2 2v2.778c-.609.549-1 1.336-1 2.222z"/><path fill="#D5AB88" d="M9.062 25c1.024 0 1.925-.526 2.45-1.322.123.183.271.346.431.497.049.046.102.085.155.128.119.099.243.189.377.269.066.039.132.074.201.108.14.069.285.125.435.172.067.021.131.046.2.062.223.052.452.086.689.086.236 0 .461-.036.681-.089.076-.018.148-.042.223-.066.137-.044.269-.099.396-.161.082-.04.163-.076.24-.124.164-.1.318-.213.46-.341.202-.184.384-.387.53-.618l-.003-.003c.2.115.473.402 1.473.402h2.537c-1.809 1.365-3.037 3.99-3.037 7 0 .276.224.5.5.5s.5-.224.5-.5c0-3.859 2.187-7 4.875-7h.125c.276 0 .5-.224.5-.5s-.224-.5-.5-.5H18c-1.104 0-2-.896-2-2s.896-2 2-2h8c.032 0 .062.008.094.01.073.003.145.01.216.022.062.01.122.021.182.037.064.017.125.035.187.058.062.022.122.047.181.075.057.027.111.058.165.09.056.033.109.067.161.107.052.038.102.08.15.124.046.041.09.084.132.13.027.029.051.06.075.091l.052.063c.038.051.073.102.106.156.034.056.064.112.093.171.03.062.056.125.08.19.012.031.029.06.039.093L29 24c.103.335.479 1.871.411 2.191C29.411 31 24.715 36 19 36c-6.537 0-11.844-5.231-11.986-11.734l.014.01c.515.445 1.176.724 1.91.724h.124z"/></svg> \ No newline at end of file |
