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/1f91d.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/1f91d.svg')
-rw-r--r-- | public/emoji/1f91d.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91d.svg b/public/emoji/1f91d.svg index d6b87a93f..3d797a089 100644 --- a/public/emoji/1f91d.svg +++ b/public/emoji/1f91d.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="clipPath32" clipPathUnits="userSpaceOnUse"><path id="path34" d="m 15.243,28.216 c 0.815,-1.629 2.936,-3.638 4.211,-4.21 l 0,0 c 0.844,-0.379 0,-1.053 -1.607,-2.134 l 0,0 C 16.65,21.068 12.155,18.981 8.693,15.459 l 0,0 c -1.45,-1.475 0.531,-3.254 1.525,-2.293 l 0,0 c 2.777,2.689 5.996,4.494 5.996,4.494 l 0,0 0.196,-0.609 c -2.051,-1.156 -5.383,-3.944 -7.093,-5.5 l 0,0 C 7.995,10.346 9.728,8.258 10.841,9.187 l 0,0 c 3.336,2.788 6.766,5.02 6.766,5.02 l 0,0 0.366,-0.53 c -1.31,-0.789 -4.454,-3.163 -6.211,-4.744 l 0,0 C 10.436,7.745 12.113,5.707 13.375,6.792 l 0,0 c 1.857,1.595 6.237,4.651 6.237,4.651 l 0,0 0.369,-0.386 C 18.902,10.38 17.209,9.118 14.995,7.098 l 0,0 C 13.666,5.886 15.452,4.55 16.339,5.249 l 0,0 c 1.096,0.861 3.834,3.338 7.261,4.8 l 0,0 c 5.232,2.242 7.164,4.335 7.628,5.129 l 0,0 c 0.858,1.458 2.181,2.058 3.093,2.511 l 0,0 c 0.909,0.45 1.143,1.702 0.718,2.553 l 0,0 c -0.421,0.854 -2.505,4.958 -2.953,5.869 l 0,0 c -0.453,0.909 -1.226,1.49 -2.106,1.053 l 0,0 c 0,0 -1.053,-1.053 -2.105,-1.053 l 0,0 c -2.002,0 -2.435,1.053 -5.263,1.053 l 0,0 c -2.105,0 -4.211,2.105 -5.264,3.157 l 0,0 C 16.873,30.796 16.412,31 16.02,31 l 0,0 c -0.981,0 -1.529,-1.28 -0.777,-2.784"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" 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(30.043,24.9624)" id="g20"><path id="path22" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.882,0.436 1.618,-0.286 2.068,-1.195 2.521,-2.106 3.928,-5.733 4.351,-6.587 4.772,-7.44 3.694,-7.196 2.783,-7.645 1.873,-8.097 0.99,-8.391 0.167,-8.799 c -0.826,-0.411 -1.275,-3.15 -6.508,-5.388 -3.429,-1.467 -3.545,-3.264 -6.661,-5.85 -1.145,-0.951 -3.096,0.32 -1.764,1.535 2.213,2.018 3.905,3.279 4.985,3.958 l -0.368,0.383 c 0,0 -4.173,-2.931 -5.995,-4.565 -1.326,-1.188 -3.417,1.175 -2.093,2.365 1.756,1.579 5.14,3.648 6.449,4.438 l -0.367,0.526 c 0,0 -3.159,-2.064 -6.493,-4.85 -1.255,-1.045 -3.458,1.249 -2.135,2.453 1.709,1.557 5.382,4.084 7.432,5.242 l -0.197,0.611 c 0,0 -3.218,-1.808 -5.996,-4.494 -0.994,-0.962 -2.974,0.818 -1.523,2.29 3.462,3.524 7.921,5.666 9.153,6.414 1.581,0.961 3.222,2.395 2.378,2.774 -1.277,0.572 -0.479,1.292 -2.106,2.105 -2.106,1.053 -2.677,3.158 -1.053,3.158 1.052,0 1.711,-1.925 4.212,-2.105 C -5.665,1.998 -3.91,-1.903 -2.12,-1.015 -1.352,-0.634 0,0 0,0"/></g><g transform="translate(29.9795,27.1636)" id="g24"><path id="path26" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.881,0.437 1.653,-0.144 2.106,-1.053 2.555,-1.964 4.639,-6.068 5.06,-6.921 5.484,-7.773 5.251,-9.025 4.341,-9.474 3.43,-9.927 2.106,-10.528 1.249,-11.986 c -0.465,-0.794 -2.397,-2.887 -7.629,-5.129 -3.427,-1.462 -6.165,-3.938 -7.261,-4.8 -0.886,-0.698 -2.673,0.637 -1.343,1.85 2.213,2.02 3.906,3.281 4.985,3.958 l -0.368,0.386 c 0,0 -4.381,-3.056 -6.238,-4.651 -1.261,-1.085 -2.938,0.954 -1.613,2.142 1.757,1.58 4.902,3.954 6.211,4.744 l -0.366,0.529 c 0,0 -3.43,-2.231 -6.765,-5.019 -1.113,-0.93 -2.846,1.159 -1.525,2.364 1.71,1.555 5.043,4.343 7.093,5.499 l -0.196,0.61 c 0,0 -3.218,-1.805 -5.996,-4.495 -0.993,-0.961 -2.974,0.819 -1.525,2.293 3.463,3.522 7.958,5.609 9.155,6.413 1.606,1.081 2.45,1.755 1.606,2.134 -1.275,0.572 -3.396,2.581 -4.21,4.21 -1.053,2.106 0.44,3.77 2.105,2.106 C -11.578,2.105 -9.473,0 -7.368,0 -4.539,0 -4.107,-1.053 -2.105,-1.053 -1.053,-1.053 0,0 0,0"/></g></g></g><g id="g28"><g clip-path="url(#clipPath32)" id="g30"><g transform="translate(19.7266,23.7422)" id="g36"><path id="path38" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.7,-0.76 1.545,-1.682 2.638,-2.185 3.883,-2.759 4.987,-2.91 5.321,-2.91 5.667,-2.913 5.854,-3.512 5.283,-3.537 4.727,-3.56 3.494,-3.295 2.412,-2.77 1.38,-2.271 0.185,-1.207 -0.471,-0.364 L 0,0 Z"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(6.7778,26.2041)" id="g48"><path id="path50" style="fill:#ef9645;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.843,0.511 -1.649,-0.029 -2.174,-0.898 -0.525,-0.871 -2.223,-4.666 -2.717,-5.484 -0.491,-0.814 0.718,-0.841 1.588,-1.364 0.87,-0.525 2.157,-1.895 2.945,-2.372 0.789,-0.474 1.118,-3.849 5.665,-6.819 4.298,-2.807 6.976,-4.014 7.982,-4.517 2.106,-1.053 3.476,1.678 1.833,2.412 -2.833,1.266 -5.155,2.247 -6.178,3.015 l 0.149,0.427 c 0,0 3.294,-2.099 7.447,-3.824 1.537,-0.639 2.829,2.25 1.205,2.982 -2.422,1.088 -5.738,2.537 -6.978,3.432 l 0.219,0.423 c 0,0 4.119,-2.635 7.998,-4.383 1.434,-0.643 3.072,2.264 1.453,3.019 -2.264,1.053 -5.936,2.764 -7.879,4.089 l 0.336,0.5 c 0,0 3.48,-2.656 6.569,-3.929 1.278,-0.525 3.195,2.06 1.316,2.917 -3.782,1.726 -8.583,4.957 -9.708,5.858 -0.917,0.736 -1.411,3.197 -0.5,3.37 1.213,0.23 4.211,2.106 5.262,3.158 1.053,1.052 -0.124,1.98 -1.051,1.052 C 13.729,2.012 12.776,0.393 10.267,0.42 7.44,0.452 3.742,-2.22 2.029,-1.185 1.295,-0.744 0,0 0,0"/></g><g transform="translate(7.0903,26.7222)" id="g52"><path id="path54" style="fill:#ffdc5d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.843,0.508 -1.96,0.256 -2.485,-0.615 -0.525,-0.87 -2.828,-4.683 -3.32,-5.5 -0.492,-0.817 -0.363,-2.079 0.506,-2.604 0.87,-0.527 2.447,-1.478 3.236,-1.952 0.789,-0.477 4.011,-4.477 8.662,-7.28 4.648,-2.807 6.365,-3.286 7.411,-3.697 1.05,-0.41 2.437,1.683 0.793,2.416 -2.837,1.268 -4.835,2.438 -5.859,3.205 l 0.318,0.585 c 0,0 2.837,-2.12 6.987,-3.848 1.538,-0.639 2.791,1.754 1.167,2.488 -2.422,1.089 -5.412,2.893 -6.65,3.79 l 0.346,0.571 c 0,0 3.946,-2.494 7.825,-4.242 1.431,-0.645 2.632,1.786 1.013,2.542 -2.26,1.054 -5.449,2.955 -7.394,4.277 l 0.338,0.5 c 0,0 3.615,-2.551 6.705,-3.823 1.277,-0.528 2.78,1.861 0.9,2.721 -3.779,1.725 -8.064,4.743 -9.188,5.644 -0.918,0.737 -1.181,2.413 1.052,3.158 3.158,1.053 4.211,3.158 4.211,4.21 0,1.489 -1.376,2.146 -2.105,1.053 C 12.363,0.441 11.303,1.518 9.206,0.441 6.692,-0.849 3.74,-2.22 2.027,-1.187 1.294,-0.745 0,0 0,0"/></g><g transform="translate(18.9482,24.2793)" id="g56"><path id="path58" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 5.426,2.712 c -0.477,0.102 -1.04,0.172 -1.763,0.172 -2.104,0 -4.21,2.105 -5.263,3.158 -1.665,1.664 -3.158,0 -2.105,-2.105 C -2.991,2.508 -1.272,0.788 0,0"/></g><g transform="translate(14.6709,5.6748)" id="g60"><path id="path62" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.258,-0.425 0.807,-0.689 1.282,-0.598 L 0,0 Z"/></g><g transform="translate(11.5029,7.1533)" id="g64"><path id="path66" style="fill:#ffcc4d;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.29,-0.467 0.819,-0.769 1.358,-0.634 L 0,0 Z"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#EF9645" d="M17 18s-6.031 5.274-7.74 6.832c-1.323 1.203.88 3.498 2.135 2.452 3.333-2.785 6.493-4.85 6.493-4.85l.367.526c-1.309.79-4.693 2.858-6.449 4.438-1.324 1.19.767 3.553 2.093 2.365 1.822-1.634 5.995-4.565 5.995-4.565l.368.384c-1.08.679-2.772 1.94-4.985 3.958-1.332 1.215.619 2.485 1.764 1.534 3.116-2.586 3.232-4.383 6.661-5.85C28.935 22.986 17 18 17 18z"/><path fill="#FFCC4D" d="M29.979 8.836c.881-.438 1.653.144 2.106 1.053.448.911 2.532 5.015 2.953 5.869.425.852.191 2.103-.719 2.553-.911.453-2.234 1.054-3.092 2.512-.465.794-2.396 2.887-7.629 5.129-3.427 1.462-6.165 3.938-7.261 4.8-.886.698-2.673-.637-1.343-1.85 2.214-2.02 3.906-3.281 4.985-3.958l-.368-.386s-4.381 3.056-6.238 4.65c-1.261 1.085-2.938-.953-1.613-2.142 1.757-1.58 4.902-3.954 6.211-4.744l-.366-.529s-3.43 2.231-6.765 5.02c-1.113.93-2.847-1.159-1.525-2.364 1.71-1.555 5.043-4.343 7.093-5.499l-.196-.609s-3.218 1.805-5.996 4.494c-.994.961-2.974-.818-1.525-2.293 3.462-3.522 7.958-5.609 9.154-6.413 1.606-1.08 2.451-1.754 1.606-2.133-1.274-.573-3.396-2.582-4.21-4.21-1.053-2.106.44-3.77 2.105-2.106 1.053 1.053 3.159 3.158 5.263 3.158 2.829 0 3.262 1.053 5.264 1.053 1.054-.002 2.106-1.055 2.106-1.055"/><path fill="#EF9645" d="M25.048 15.167c-.334.001-1.439-.15-2.684-.725-1.073-.494-1.905-1.39-2.597-2.142.039.161-.065.354-.283.58.681.792 1.723 1.696 2.654 2.146 1.082.525 2.315.79 2.871.767.572-.024.385-.622.039-.626zm2.167 8.58c-2.264-1.054-4.062-1.934-.974-.66 1.277.525 3.194-2.06 1.315-2.917C23.774 18.444 12 12 12 12s-6.368 7.437-5.58 7.914c.789.474 1.118 3.849 5.665 6.818 4.298 2.808 6.975 4.015 7.981 4.518 2.107 1.053 3.477-1.678 1.833-2.412-2.833-1.266-2.734-1.343 1.418.382 1.537.64 2.829-2.25 1.205-2.981-2.422-1.089-2.64-1.221 1.239.527 1.435.643 3.073-2.264 1.454-3.019z"/><path fill="#FFDC5D" d="M7.09 9.278c-.842-.509-1.96-.256-2.485.615-.525.871-2.828 4.683-3.319 5.5-.492.816-.364 2.079.506 2.604.87.526 2.447 1.477 3.236 1.952.789.477 4.011 4.477 8.662 7.279 4.648 2.808 6.366 3.286 7.412 3.697 1.05.41 2.437-1.683.793-2.416-2.837-1.268-4.836-2.438-5.859-3.205l.318-.585s2.837 2.12 6.987 3.848c1.537.64 2.79-1.754 1.167-2.487-2.423-1.089-5.412-2.894-6.651-3.79l.346-.571s3.946 2.494 7.825 4.242c1.431.645 2.632-1.786 1.013-2.542-2.26-1.054-5.448-2.955-7.394-4.277l.338-.5s3.615 2.551 6.705 3.823c1.277.528 2.78-1.861.899-2.721C23.81 18.019 19.525 15 18.401 14.1c-.918-.737-1.181-2.413 1.052-3.158 3.158-1.053 4.211-3.158 4.211-4.211 0-1.489-1.376-2.146-2.104-1.053-2.107 3.158-3.166 2.082-5.263 3.158-2.514 1.291-5.466 2.662-7.179 1.628-.733-.441-2.028-1.186-2.028-1.186"/><path fill="#FFCC4D" d="M18.948 11.721l5.426-2.712c-.477-.102-1.04-.172-1.763-.172-2.104 0-4.21-2.105-5.263-3.158-1.665-1.664-3.158 0-2.105 2.106.715 1.428 2.433 3.148 3.705 3.936z"/></svg> \ No newline at end of file |