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/1f473-1f3fb-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/1f473-1f3fb-200d-2640-fe0f.svg')
-rw-r--r-- | public/emoji/1f473-1f3fb-200d-2640-fe0f.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f473-1f3fb-200d-2640-fe0f.svg b/public/emoji/1f473-1f3fb-200d-2640-fe0f.svg index ffe17f168..f93ddcc6b 100644 --- a/public/emoji/1f473-1f3fb-200d-2640-fe0f.svg +++ b/public/emoji/1f473-1f3fb-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,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 12,9 C 8.687,9 5,6.815 5,3.5 L 5,3.5 5,0 31,0 31,3.5 C 31,6.815 27.314,9 24,9 l 0,0 -12,0 z"/></clipPath><clipPath id="clipPath44" clipPathUnits="userSpaceOnUse"><path id="path46" d="M 0,0 33,0 33,36 0,36 0,0 Z"/></clipPath><clipPath id="clipPath80" clipPathUnits="userSpaceOnUse"><path id="path82" 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(31,0)" id="g20"><path id="path22" style="fill:#9266cc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0,3.5 C 0,6.814 -3.686,9 -7,9 l -12,0 c -3.313,0 -7,-2.186 -7,-5.5 L -26,0 0,0 Z"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(23.5,8.75)" id="g32"><path id="path34" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0.084 -0.011,0.167 -0.021,0.25 l -10.958,0 C -10.989,0.167 -11,0.084 -11,0 c 0,-1.27 1.235,-2.366 3.031,-2.901 0.154,-1.604 1.195,-2.849 2.469,-2.849 1.274,0 2.315,1.245 2.469,2.849 C -1.235,-2.366 0,-1.27 0,0"/></g><g transform="translate(24.796,10.5)" id="g36"><path id="path38" style="fill:#744eaa;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.317,0 -10.957,0 -1.318,0 -0.17,-1.306 c -0.019,-0.148 -0.034,-0.295 -0.034,-0.444 0,-1.688 1.212,-3.175 3.221,-4.024 C -10.04,-7.668 -8.538,-9 -6.796,-9 c 1.742,0 3.244,1.332 3.779,3.226 2.009,0.849 3.221,2.336 3.221,4.024 0,0.149 -0.015,0.296 -0.034,0.444 L 0,0 Z m -1.317,-1.5 c 0.01,-0.083 0.021,-0.166 0.021,-0.25 0,-1.27 -1.235,-2.366 -3.031,-2.901 -0.154,-1.604 -1.195,-2.849 -2.469,-2.849 -1.274,0 -2.315,1.245 -2.469,2.849 -1.796,0.535 -3.031,1.631 -3.031,2.901 0,0.084 0.011,0.167 0.022,0.25 l 10.957,0"/></g></g></g><g id="g40"><g clip-path="url(#clipPath44)" id="g42"><g transform="translate(14.3281,8.9805)" id="g48"><path id="path50" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.466,-1.065 2.964,-1.98 3.672,-1.98 0.708,0 2.194,0.915 3.66,1.98 l 0,3.205 L 0,3.205 0,0 Z"/></g><g transform="translate(14.3213,10.8213)" id="g52"><path id="path54" style="fill:#eec2ad;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.023,-1.155 2.291,-1.468 3.669,-1.468 1.379,0 2.647,0.313 3.67,1.468 l 0,2.936 L 0,2.936 0,0 Z"/></g><g transform="translate(9.7339,20.2827)" id="g56"><path id="path58" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,5.834 3.676,10.563 8.21,10.563 4.535,0 8.211,-4.729 8.211,-10.563 0,-5.833 -3.676,-10.286 -8.211,-10.286 C 3.676,-10.286 0,-5.833 0,0"/></g><g transform="translate(17.9443,12.457)" id="g60"><path id="path62" style="fill:#df1f32;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.605,0 -2.446,0.794 -2.536,0.885 -0.268,0.266 -0.268,0.7 0,0.967 0.265,0.264 0.692,0.266 0.96,0.006 C -1.541,1.826 -1.023,1.367 0,1.367 1.039,1.367 1.557,1.84 1.577,1.859 1.851,2.115 2.28,2.107 2.54,1.84 2.8,1.571 2.8,1.148 2.536,0.885 2.446,0.794 1.606,0 0,0"/></g><g transform="translate(14.6084,18.1138)" id="g64"><path id="path66" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.847,-0.381 0.847,-0.846 l 0,-0.845 C 0.847,0.381 0.465,0 0,0"/></g><g transform="translate(21.373,18.1138)" id="g68"><path id="path70" style="fill:#662113;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,0 c -0.465,0 -0.846,0.381 -0.846,0.846 l 0,0.845 c 0,0.465 0.381,0.846 0.846,0.846 0.465,0 0.846,-0.381 0.846,-0.846 l 0,-0.845 C 0.846,0.381 0.465,0 0,0"/></g><g transform="translate(18.8369,15.5)" id="g72"><path id="path74" style="fill:#c1694f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.691,0 c -0.234,0 -0.423,0.189 -0.423,0.423 l 0,0.153 C -2.114,0.81 -1.925,1 -1.691,1 L 0,1 C 0.232,1 0.423,0.81 0.423,0.576 l 0,-0.153 C 0.423,0.189 0.232,0 0,0"/></g></g></g><g id="g76"><g clip-path="url(#clipPath80)" id="g78"><g transform="translate(11.4443,20.0645)" id="g84"><path id="path86" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.734,-2.622 -1.639,-2.622 -0.905,0 -1.639,1.174 -1.639,2.622 0,1.448 0.734,2.623 1.639,2.623 C -0.734,2.623 0,1.448 0,0"/></g><g transform="translate(27.833,20.0645)" id="g88"><path id="path90" style="fill:#f7dece;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,-1.448 -0.733,-2.622 -1.639,-2.622 -0.905,0 -1.638,1.174 -1.638,2.622 0,1.448 0.733,2.623 1.638,2.623 C -0.733,2.623 0,1.448 0,0"/></g><g transform="translate(18,26.2715)" id="g92"><path id="path94" style="fill:#e6e7e8;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 6.752,-1.756 7.787,-4.916 0.451,0.965 0.713,3.138 0.713,4.33 0,3.626 -3,6.315 -7.438,6.315 l -2.124,0 c -3.896,0 -7.438,-2.689 -7.438,-6.315 0,-1.192 0.262,-3.491 0.712,-4.455 C -6.752,-1.88 0,0 0,0"/></g><g transform="translate(26.4775,25.0986)" id="g96"><path id="path98" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -1.318,1.053 -2.866,1.922 -4.348,2.416 -4.692,2.531 -5.061,2.344 -5.175,2.003 -5.289,1.66 -5.104,1.29 -4.762,1.175 -3.188,0.651 -1.47,-0.389 -0.159,-1.586 -0.08,-1.038 -0.026,-0.485 0,0"/></g><g transform="translate(9.6104,24.0273)" id="g100"><path id="path102" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.895,1.355 8.186,5.421 15.434,5.477 15.023,5.949 14.544,6.371 14.008,6.73 7.674,6.259 2.259,3.104 -0.105,1.515 -0.096,1.085 -0.062,0.558 0,0"/></g><g transform="translate(25.9248,28.186)" id="g104"><path id="path106" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.027,0.003 -0.051,0.016 -0.079,0.016 -2.677,0 -5.386,-0.672 -8.054,-1.992 0.132,0.04 0.208,0.061 0.208,0.061 0,0 0.771,-0.2 1.829,-0.586 2.008,0.798 4.026,1.209 6.017,1.209 0.192,0 0.36,0.086 0.48,0.217 C 0.305,-0.702 0.169,-0.343 0,0"/></g><g transform="translate(9.6772,27.1196)" id="g108"><path id="path110" style="fill:#d1d3d4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 2.339,1.498 6.791,3.734 11.74,4.596 10.989,4.818 10.196,4.88 9.385,4.88 l -1.667,0 C 5.146,3.88 2.853,3.065 1.087,2.092 0.581,1.452 0.204,0.788 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#9266CC" d="M31 36v-3.5c0-3.314-3.685-5.5-7-5.5H12c-3.313 0-7 2.186-7 5.5V36h26z"/><path fill="#744EAA" d="M14.221 31.274C14.756 33.168 16.258 34.5 18 34.5s3.244-1.332 3.779-3.226C23.788 30.425 25 28.938 25 27.25c0-.061-.01-.121-.014-.181-.33-.042-.66-.069-.986-.069H12c-.326 0-.656.027-.986.069-.004.06-.014.12-.014.181 0 1.688 1.212 3.175 3.221 4.024z"/><path fill="#F7DECE" d="M23.479 27H21.66v-3.185h-7.32V27h-1.818c-.011.083-.021.166-.021.25 0 1.27 1.235 2.366 3.031 2.901C15.685 31.755 16.726 33 18 33s2.315-1.245 2.469-2.849c1.796-.535 3.031-1.632 3.031-2.901 0-.084-.011-.167-.021-.25z"/><path fill="#EEC2AD" d="M14.321 25.179c1.023 1.155 2.291 1.468 3.669 1.468 1.379 0 2.647-.312 3.67-1.468v-2.936h-7.339v2.936z"/><path fill="#F7DECE" d="M27.833 15.936c0 1.448-.733 2.622-1.639 2.622-.905 0-1.639-1.174-1.639-2.622s.733-2.623 1.639-2.623c.906-.001 1.639 1.174 1.639 2.623m-16.389 0c0 1.448-.734 2.622-1.639 2.622s-1.639-1.174-1.639-2.622.734-2.623 1.639-2.623c.905-.001 1.639 1.174 1.639 2.623"/><path fill="#F7DECE" d="M9.734 15.717c0-5.834 3.676-10.563 8.21-10.563 4.534 0 8.211 4.729 8.211 10.563 0 5.833-3.677 10.286-8.211 10.286-4.534 0-8.21-4.452-8.21-10.286"/><path fill="#DF1F32" d="M17.944 23.543c-1.605 0-2.446-.794-2.536-.885-.268-.267-.268-.7 0-.967.266-.265.692-.267.96-.007.035.032.553.491 1.576.491 1.039 0 1.557-.473 1.577-.492.273-.256.703-.248.963.02.26.269.26.691-.004.955-.089.091-.929.885-2.536.885"/><path fill="#662113" d="M14.608 17.886c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846s.847.381.847.846v.845c0 .465-.382.846-.847.846m6.765 0c-.465 0-.846-.381-.846-.846v-.845c0-.465.381-.846.846-.846.465 0 .846.381.846.846v.845c0 .465-.381.846-.846.846"/><path fill="#C1694F" d="M18.837 20.5h-1.691c-.233 0-.423-.19-.423-.423v-.153c0-.233.189-.424.423-.424h1.691c.232 0 .423.19.423.424v.153c0 .233-.191.423-.423.423"/><path fill="#E6E7E8" d="M18 9.729s6.752 1.756 7.787 4.916c.451-.965.713-3.138.713-4.33C26.5 6.688 23.5 4 19.062 4h-2.125C13.042 4 9.5 6.688 9.5 10.314c0 1.192.262 3.491.712 4.455C11.248 11.608 18 9.729 18 9.729z"/><path fill="#D1D3D4" d="M23.901 9.251c.65-.086 1.299-.145 1.945-.145.192 0 .36-.086.48-.217-.097-.374-.232-.732-.401-1.075-.027-.004-.051-.016-.079-.016-2.677 0-5.386.671-8.054 1.991l.208-.06s.771.201 1.829.587c.615-.245 1.232-.44 1.848-.612.014.006.024.017.039.022 1.573.524 3.292 1.564 4.603 2.761.079-.548.133-1.101.159-1.586-.797-.636-1.679-1.191-2.577-1.65zM9.61 11.973c1.895-1.354 8.186-5.421 15.433-5.477-.41-.473-.89-.894-1.426-1.253-6.334.471-11.749 3.626-14.113 5.215.01.43.044.957.106 1.515zm.067-3.093c2.339-1.498 6.791-3.734 11.74-4.596C20.666 4.062 19.873 4 19.062 4h-1.667c-2.572 1-4.866 1.815-6.632 2.788-.505.641-.882 1.304-1.086 2.092z"/></svg> \ No newline at end of file |