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/1f3cc-1f3fd-200d-2640-fe0f.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/1f3cc-1f3fd-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f3cc-1f3fd-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f3cc-1f3fd-200d-2640-fe0f.svg b/public/emoji/1f3cc-1f3fd-200d-2640-fe0f.svg index 0fb927c82..353c5c2e6 100644 --- a/public/emoji/1f3cc-1f3fd-200d-2640-fe0f.svg +++ b/public/emoji/1f3cc-1f3fd-200d-2640-fe0f.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(23.3307,4.4287)" id="g20"><path id="path22" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.397,0.703 -2.062,3.517 -2.271,4.202 -0.208,0.689 -0.65,5.92 -0.425,8.497 0,0 -4.17,2.707 -3.805,-0.281 0.37,-3.032 1.246,-8.775 1.412,-9.329 0.166,-0.552 2.588,-3.443 3.342,-4.393 C -1.33,-1.831 0.346,-0.61 0,0"/></g><g transform="translate(20.7508,17.1279)" id="g24"><path id="path26" style="fill:#be1931;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -4.48,-0.281 c 0.236,-1.643 -0.646,-4.644 1.51,-6.081 0,0 2.817,0.587 4.438,0.047 C 2.28,-6.586 -0.155,-1.504 0,0"/></g><g transform="translate(19.75,17.9063)" id="g28"><path id="path30" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.519,2.866 -5.22,-0.469 -5.22,-0.469 0,0 -1.768,-8.649 -1.768,-9.48 0,-0.828 0.914,-4.529 1.165,-5.857 0.084,-0.439 2.633,-0.614 2.523,0.355 -0.069,0.598 -0.517,4.492 -0.444,4.948 0.073,0.458 0.452,2.888 1.109,4.426 C -2.165,-4.978 0.693,-3.828 0,0"/></g><g transform="translate(13.9375,17.4375)" id="g32"><path id="path34" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.781,-5.875 c 2.484,-0.953 5.564,-0.936 5.625,-0.797 0.082,0.187 -0.521,0.597 -0.431,0.767 0.586,1.099 4.24,2.546 3.374,6.374 C 6.14,3.335 0,0 0,0"/></g><g transform="translate(13.2277,32.5205)" id="g36"><path id="path38" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.152,-0.278 -0.643,-0.3 -1.093,-0.052 l -2.613,1.418 c -0.449,0.249 0.028,1.304 0.479,1.055 L -0.535,0.955 C -0.085,0.706 0,0 0,0"/></g><g transform="translate(16.5114,2.2559)" id="g40"><path id="path42" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.658,0.864 -4.719,-0.256 -6.118,-0.957 -0.934,-0.469 -0.657,-1.299 -0.657,-1.299 l 7.033,0 c 0,0 0.399,1.391 -0.258,2.256"/></g><g transform="translate(20.3565,27.0678)" id="g44"><path id="path46" style="fill:#cc9b7a;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.148,1.12 -5.023,2.745 -7.273,5.713 -7.508,6.023 -9.395,4.769 -9.242,4.557 -7.117,1.62 -4.804,-0.943 1.833,-2.841 1.903,-2.861 1.958,-2.871 2,-2.883 2.198,-2.617 0.891,-0.464 0,0"/></g><g transform="translate(25.3952,30.7842)" id="g48"><path id="path50" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.976 -1.602,-3.579 -3.578,-3.579 -1.976,0 -3.579,1.603 -3.579,3.579 0,1.977 1.603,3.579 3.579,3.579 C -1.602,3.579 0,1.977 0,0"/></g><g transform="translate(19.948,30.7847)" id="g52"><path id="path54" style="fill:#dd2e44;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.71,1.278 -2.587,3.85 -1.95,4.525 -0.754,5.793 1.737,4.634 2.378,3.542 3.02,2.448 0.519,-0.387 0,0"/></g><g transform="translate(13.9375,17.4375)" id="g56"><path id="path58" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0,0 -0.685,6.782 2.383,9.149 4.673,10.917 8.526,9.595 9.548,7.55 10.572,5.505 6.914,4.383 6.914,-0.729 6.914,-1.753 0,-2.004 0,0"/></g><g transform="translate(20.1984,30.1865)" id="g60"><path id="path62" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.466,-1.068 -0.788,-1.977 -0.988,-2.783 0.574,-0.271 1.061,-1.309 1.7,-1.542 1.056,-0.383 1.173,0.277 1.198,0.398 0.257,1.297 0.908,2.537 1.328,3.203 C 3.75,0.085 0.592,1.36 0,0"/></g><g transform="translate(18.9611,32.9395)" id="g64"><path id="path66" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.151 1.674,-4.486 4.971,-4.473 1.727,0.007 2.037,1.91 2.028,3.172 C 6.994,-0.22 5.824,1.665 4.192,2.132 2.56,2.6 0,1.453 0,0"/></g><g transform="translate(22.906,4.5439)" id="g68"><path id="path70" style="fill:#ccd6dd;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.5,0.255 1.286,-1.386 1.247,-1.974 -0.093,-1.4 -0.37,-2.57 -1.362,-2.57 l -3.322,0 c 0,0 -0.184,1.523 1.603,1.868 C -1.48,-2.607 -2.145,-0.364 0,0"/></g><g transform="translate(13.8391,32.7368)" id="g72"><path id="path74" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-0.912 -0.763,-1.652 -1.705,-1.652 -0.941,0 -1.704,0.74 -1.704,1.652 0,0.913 0.763,1.652 1.704,1.652 C -0.763,1.652 0,0.913 0,0"/></g><g transform="translate(17.9159,26.3279)" id="g76"><path id="path78" style="fill:#d5ab88;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.993,0 -3.435,0.498 -4.286,1.481 -0.74,0.855 -1.005,2.053 -0.787,3.561 l 0.026,0.168 c 0.057,0.354 0.067,0.418 -0.139,0.605 -0.25,0.226 -0.85,0.461 -1.419,0.461 -0.488,0 -0.755,-0.157 -0.793,-0.465 -0.871,-7.123 4.099,-7.825 5.732,-8.055 0.101,-0.014 0.185,-0.026 0.255,-0.038 0.304,0.404 1.045,1.391 1.722,2.286 C 0.206,0.001 0.102,0 0,0"/></g><g transform="translate(29.6081,24.0825)" id="g80"><path id="path82" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.026,-0.522 0.866,-4.595 0,-4.595 -0.867,0 -2.192,0.805 -2.004,1.61 C -1.815,-2.18 -1.123,0.57 0,0"/></g><g transform="translate(23.5063,28.0955)" id="g84"><path id="path86" style="fill:#963b22;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -0.199,1.072 1.3,1.197 1.236,0.103 1.563,-1.248 2.458,-1.731 0.675,-0.365 1.447,-0.377 1.985,-0.013 0,0 -0.74,-0.896 -1.571,-1.238 C 3.092,-2.229 1.761,-1.944 1.126,-1.604 0.134,-1.073 0,0 0,0"/></g><g transform="translate(29.9587,23.2476)" id="g88"><path id="path90" style="fill:#66757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.152,-0.278 -0.643,-0.301 -1.093,-0.052 l -15.318,8.481 c -0.449,0.249 -0.192,1.424 0.257,1.175 l 15.62,-8.65 C -0.085,0.705 0.155,0.278 0,0"/></g><g transform="translate(14.4446,27.6146)" id="g92"><path id="path94" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.384,-1.283 -1.605,-2.723 -1.605,-2.723 1.765,-1.579 3.844,-1.72 3.844,-1.72 0,0 1.818,2.049 2.159,3.28 C 2.847,-1.594 0,0 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#CC9B7A" d="M23.331 31.571c-.397-.703-2.062-3.517-2.271-4.202-.208-.688-.65-5.92-.425-8.497 0 0-4.17-2.707-3.805.281.371 3.032 1.247 8.775 1.412 9.329.166.552 2.589 3.442 3.342 4.393.417.527 2.093-.693 1.747-1.304z"/><path fill="#BE1931" d="M20.751 18.872l-4.48.281c.237 1.643-.646 4.644 1.51 6.081 0 0 2.817-.587 4.438-.047.812.271-1.623-4.811-1.468-6.315z"/><path fill="#D5AB88" d="M19.75 18.094c-.519-2.866-5.22.469-5.22.469s-1.768 8.649-1.768 9.48c0 .828.914 4.528 1.165 5.856.084.439 2.633.614 2.523-.354-.069-.599-.517-4.492-.444-4.948.073-.458.452-2.888 1.109-4.426.47-1.1 3.328-2.249 2.635-6.077z"/><path fill="#DD2E44" d="M13.937 18.562l-1.781 5.875c2.484.953 5.564.936 5.625.797.082-.187-.521-.597-.431-.767.586-1.1 4.239-2.546 3.374-6.374-.647-2.865-6.787.469-6.787.469z"/><path fill="#66757F" d="M13.228 3.48c-.152.278-.643.3-1.093.052L9.522 2.113C9.072 1.864 9.55.81 10 1.059l2.692 1.466c.45.249.536.955.536.955z"/><path fill="#CCD6DD" d="M16.511 33.744c-.658-.864-4.719.256-6.118.957C9.459 35.17 9.736 36 9.736 36h7.033s.4-1.391-.258-2.256z"/><path fill="#CC9B7A" d="M20.357 8.932c-2.148-1.12-5.023-2.745-7.273-5.713-.235-.31-2.122.944-1.969 1.156 2.125 2.938 4.438 5.5 11.075 7.398.069.02-.943-2.376-1.833-2.841z"/><path fill="#D5AB88" d="M25.395 5.216c0 1.976-1.601 3.579-3.578 3.579-1.977 0-3.58-1.603-3.58-3.579 0-1.976 1.603-3.579 3.58-3.579s3.578 1.602 3.578 3.579"/><path fill="#DD2E44" d="M19.948 5.215c-1.71-1.278-2.587-3.85-1.95-4.525 1.196-1.268 3.688-.109 4.328.983.641 1.094-1.86 3.929-2.378 3.542z"/><path fill="#9266CC" d="M13.937 18.562s-.685-6.782 2.383-9.149c2.289-1.768 6.143-.446 7.165 1.599 1.024 2.045-2.635 3.167-2.635 8.28.001 1.023-6.913 1.274-6.913-.73z"/><path fill="#D5AB88" d="M20.198 5.813c-.466 1.068-.788 1.977-.988 2.783.574.271 1.061 1.31 1.701 1.542 1.056.383 1.173-.277 1.197-.398.257-1.297.908-2.537 1.328-3.203.512-.809-2.645-2.084-3.238-.724z"/><path fill="#EA596E" d="M18.961 3.06c0 1.151 1.674 4.486 4.971 4.473 1.727-.007 2.037-1.91 2.028-3.172-.006-1.081-1.176-2.966-2.808-3.433-1.631-.467-4.191.679-4.191 2.132z"/><path fill="#CCD6DD" d="M22.906 31.456c1.5-.255 1.286 1.386 1.247 1.974-.093 1.4-.37 2.57-1.362 2.57H19.47s-.184-1.522 1.603-1.868c.353-.069-.312-2.312 1.833-2.676z"/><path fill="#D5AB88" d="M17.916 9.672c-1.993 0-3.435-.498-4.286-1.481-.717-.828-.977-1.983-.796-3.425.592-.259 1.006-.833 1.006-1.503 0-.913-.763-1.652-1.705-1.652-.94 0-1.704.739-1.704 1.652 0 .194.041.377.104.55-.004.017-.015.03-.017.048-.871 7.123 4.099 7.824 5.732 8.055.101.014 1.768-2.244 1.666-2.244z"/><path fill="#963B22" d="M23.506 7.904s-.199-1.072 1.3-1.197c1.236-.103 1.563 1.248 2.458 1.731.675.364 1.447.376 1.985.013 0 0-.74.896-1.571 1.238-1.08.444-2.411.159-3.046-.181-.992-.531-1.126-1.604-1.126-1.604z"/><path fill="#66757F" d="M29.608 11.917c-.013-.006-.025-.007-.037-.012-.049-.036-.091-.076-.147-.107l-15.62-8.65c-.449-.249-.706.926-.257 1.175l14.883 8.24c-.436.748-.717 1.871-.827 2.339-.189.805 1.137 1.61 2.004 1.61.867.001 1.027-4.072.001-4.595z"/><path fill="#9266CC" d="M14.445 8.385c-.384 1.283-1.605 2.723-1.605 2.723 1.765 1.579 3.844 1.719 3.844 1.719s1.818-2.049 2.159-3.28c-1.551.432-4.398-1.162-4.398-1.162z"/></svg> \ No newline at end of file |