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/26f7-1f3fc.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/26f7-1f3fc.svg')
-rw-r--r-- | public/emoji/26f7-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/26f7-1f3fc.svg b/public/emoji/26f7-1f3fc.svg index 2dd9d8b6a..e3f08e7cc 100644 --- a/public/emoji/26f7-1f3fc.svg +++ b/public/emoji/26f7-1f3fc.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(36,22.9375)" id="g20"><path id="path22" style="fill:#e1e8ed;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 0,-18.937 c 0,0 0,-4 -4,-4 l -28,0 c -4,0 -4,4 -4,4 l 0,4.937 c 0,0 17,10 36,14"/></g><g transform="translate(14.751,11.54)" id="g24"><path id="path26" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.167,-0.177 0.14,-0.473 -0.062,-0.662 -0.201,-0.189 -0.499,-0.2 -0.666,-0.023 l -6.647,7.052 c -0.167,0.177 -0.139,0.474 0.062,0.664 0.202,0.189 0.499,0.199 0.666,0.022 L 0,0 Z"/></g><g transform="translate(26.8125,18.1914)" id="g28"><path id="path30" style="fill:#aa8ed6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.435,-0.516 0.086,-1.301 -0.777,-1.756 l -19.465,-10.219 c -1.812,-0.876 -4.896,0.04 -5.271,0.79 -0.416,0.832 1.193,1.111 2.057,1.564 L -3.134,1.048 C -2.27,1.501 -1.22,1.45 -0.785,0.935 L 0,0 Z"/></g><g transform="translate(31.8252,13.6563)" id="g32"><path id="path34" style="fill:#aa8ed6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.435,-0.516 0.086,-1.301 -0.777,-1.756 l -19.465,-10.219 c -1.812,-0.876 -4.896,0.04 -5.271,0.79 -0.416,0.832 1.193,1.111 2.057,1.564 l 20.322,10.67 c 0.864,0.453 1.914,0.4 2.349,-0.113 L 0,0 Z"/></g><g transform="translate(13.4971,10.2275)" id="g36"><path id="path38" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.273,0.041 0.543,0.143 0.787,0.311 L 2.938,1.5 c 1.08,0.563 0.68,1.912 0.614,2.359 L 2.931,6.652 5.495,9.951 c 0.627,0.804 0.481,3.3 -0.324,3.926 -0.806,0.626 -1.965,0.48 -2.589,-0.325 L -0.468,9.63 C -0.778,9.232 -0.911,8.723 -0.836,8.224 L -0.203,4.006 -1.32,3.342 C -2.157,2.76 -2.364,1.609 -1.782,0.774 -1.369,0.178 -0.671,-0.098 0,0"/></g><g transform="translate(19.5938,6.2187)" id="g40"><path id="path42" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.264,0.083 2.75,1.562 2.75,1.562 3.615,2.25 3.073,4.007 2.918,4.432 L 1.48,8.354 3.33,12.1 c 0.451,0.913 0.076,2.02 -0.838,2.471 -0.914,0.452 -2.021,0.075 -2.471,-0.838 l -2.2,-4.455 C -2.402,8.824 -2.43,8.301 -2.257,7.826 L -0.788,3.821 -1.792,3.042 C -2.523,2.332 -2.539,1.164 -1.829,0.433 -1.324,-0.085 -0.646,-0.206 0,0"/></g><g transform="translate(9.6387,16.6035)" id="g44"><path id="path46" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.667,1.292 5.389,6.467 5.573,7.052 5.904,8.107 5.319,9.23 4.266,9.561 3.213,9.892 2.091,9.308 1.759,8.256 1.252,6.668 -0.042,4.226 -1.329,3.773 -2.371,3.405 -2.918,2.263 -2.551,1.221 -2.184,0.18 -1.042,-0.367 0,0"/></g><g transform="translate(34.8438,14.6738)" id="g48"><path id="path50" style="fill:#8899a6;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.228,-0.156 0.285,-0.467 0.129,-0.693 -0.028,-0.922 -0.339,-0.98 -0.565,-0.822 L -9.627,5.414 C -9.854,5.57 -9.913,5.881 -9.756,6.109 -9.6,6.337 -9.288,6.395 -9.061,6.238 L 0,0 Z"/></g><g transform="translate(27.002,18.479)" id="g52"><path id="path54" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.791,0.279 1.351,1.038 1.335,1.921 -0.058,3.346 -1.616,5.92 -4.392,7.249 -1.964,0.941 -3.863,0.937 -4.073,0.934 -1.102,-0.02 -1.985,-0.93 -1.966,-2.035 0.019,-1.1 0.923,-1.978 2.023,-1.965 1.019,0.001 4.342,-0.301 4.409,-4.251 0.019,-1.104 0.93,-1.984 2.033,-1.965 C -0.409,-0.109 -0.196,-0.069 0,0"/></g><g transform="translate(15.1318,19.0688)" id="g56"><path id="path58" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.642,-1.824 2.641,-2.781 4.464,-2.138 1.823,0.642 2.78,2.641 2.138,4.464 L 5.272,6.099 C 4.63,7.922 2.632,8.879 0.809,8.237 -1.015,7.594 -1.972,5.596 -1.33,3.772 L 0,0 Z"/></g><g transform="translate(11.4175,23.5913)" id="g60"><path id="path62" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.367,-1.041 1.509,-1.588 2.551,-1.222 l 6.602,2.327 c 1.042,0.367 1.589,1.509 1.222,2.551 C 10.008,4.698 8.866,5.245 7.824,4.878 L 1.222,2.551 C 0.18,2.184 -0.367,1.042 0,0"/></g><g transform="translate(17,18)" id="g64"><path id="path66" style="fill:#bbddf5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -2.614,0.366 -3.175,1.493 -3.244,1.689 L -4.394,4.95 C -5.224,7.308 -2.67,8.208 -0.98,8.804 0.71,9.399 2.63,8.877 4.095,7.941 6.917,6.137 6.441,1.638 6.441,1.638 6.446,1.295 6.366,0.779 6.271,0.646 6.21,0.562 4.083,-0.572 0,0"/></g><g transform="translate(29.9961,32.0625)" id="g68"><path id="path70" style="fill:#1c6399;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 -1.119,2.653 c -0.076,0.18 -0.273,0.295 -0.487,0.286 -0.129,-0.006 -3.21,-0.174 -7.169,-3.112 -3.748,-2.78 -4.635,-2.82 -6.578,-2.906 l -2.997,-0.133 c -0.133,-0.006 -0.257,-0.059 -0.347,-0.148 -0.506,-0.498 -0.614,-1.17 -0.291,-1.799 0.411,-0.796 1.623,-1.613 3.796,-1.517 1.437,0.064 3.482,1.197 5.85,2.507 2.91,1.611 6.208,3.437 8.894,3.556 0.161,0.007 0.308,0.083 0.396,0.204 C 0.038,-0.287 0.058,-0.135 0,0"/></g><g transform="translate(16.4053,31.7104)" id="g72"><path id="path74" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.734,-2.083 -0.36,-4.368 -2.443,-5.102 -2.084,-0.734 -4.368,0.36 -5.102,2.443 -0.734,2.084 0.692,3.425 2.775,4.16 C -2.686,2.234 -0.734,2.083 0,0"/></g><g transform="translate(10.3613,29.5811)" id="g76"><path id="path78" style="fill:#9aaab4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.886,0.665 3.441,2.272 3.773,1.329 4.105,0.386 4.77,-1.501 6.656,-0.835 8.542,-0.171 7.159,6.764 1.5,4.77 -4.159,2.775 -2.83,-0.997 0,0"/></g><g transform="translate(11.4707,29.4414)" id="g80"><path id="path82" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.275,-0.781 -0.135,-1.638 -0.917,-1.913 -0.781,-0.276 -1.637,0.135 -1.913,0.916 -0.275,0.782 0.135,1.638 0.916,1.913 C -1.132,1.192 -0.275,0.782 0,0"/></g><g transform="translate(9.7236,29.8862)" id="g84"><path id="path86" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.52,-0.183 -0.794,-0.755 -0.611,-1.275 0.183,-0.52 0.756,-0.794 1.276,-0.611 0.52,0.183 0.793,0.755 0.61,1.275 C 1.092,-0.091 0.52,0.183 0,0 m 0.997,-2.83 c -1.04,-0.366 -2.184,0.182 -2.551,1.222 -0.367,1.041 0.181,2.185 1.221,2.551 C 0.708,1.31 1.852,0.762 2.219,-0.278 2.585,-1.319 2.037,-2.463 0.997,-2.83"/></g><g transform="translate(14.3003,30.4385)" id="g88"><path id="path90" style="fill:#bdddf4;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.275,-0.781 -0.135,-1.638 -0.916,-1.913 -0.782,-0.276 -1.638,0.135 -1.914,0.916 -0.275,0.782 0.135,1.638 0.916,1.913 C -1.132,1.192 -0.275,0.782 0,0"/></g><g transform="translate(12.5532,30.8833)" id="g92"><path id="path94" style="fill:#67757f;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.52,-0.183 -0.794,-0.755 -0.611,-1.275 0.183,-0.52 0.756,-0.794 1.276,-0.611 0.52,0.183 0.793,0.755 0.61,1.275 C 1.092,-0.091 0.52,0.183 0,0 m 0.997,-2.83 c -1.04,-0.366 -2.184,0.182 -2.551,1.222 -0.367,1.041 0.181,2.185 1.221,2.551 C 0.708,1.31 1.852,0.762 2.218,-0.278 2.585,-1.319 2.037,-2.463 0.997,-2.83"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#E1E8ED" d="M36 13.062V32s0 4-4 4H4c-4 0-4-4-4-4v-4.938s17-10 36-14z"/><path fill="#8899A6" d="M14.751 24.46c.167.177.14.473-.062.662-.201.189-.5.2-.666.023l-6.647-7.052c-.167-.177-.139-.474.062-.664.201-.189.499-.199.666-.022l6.647 7.053z"/><path fill="#AA8ED6" d="M26.812 17.809c.435.516.086 1.301-.777 1.756L6.571 29.783c-1.812.876-4.896-.04-5.271-.79-.416-.832 1.193-1.11 2.057-1.563l20.322-10.67c.863-.453 1.914-.401 2.349.113l.784.936zm5.013 4.535c.435.516.086 1.301-.777 1.756L11.583 34.318c-1.812.876-4.896-.04-5.271-.79-.416-.832 1.193-1.11 2.057-1.563l20.322-10.67c.863-.453 1.914-.4 2.349.113l.785.936z"/><path fill="#67757F" d="M13.497 25.772c.273-.041.543-.143.787-.311l2.151-1.189c1.08-.562.68-1.912.614-2.359l-.621-2.793 2.564-3.298c.627-.804.48-3.3-.324-3.926-.806-.626-1.965-.479-2.589.325l-3.05 3.922c-.31.398-.443.907-.368 1.406l.633 4.218-1.118.664c-.837.582-1.043 1.732-.462 2.568.414.596 1.112.871 1.783.773z"/><path fill="#67757F" d="M19.594 29.781c.264-.083 2.75-1.562 2.75-1.562.865-.688.323-2.444.168-2.869l-1.438-3.923 1.85-3.745c.451-.913.076-2.021-.838-2.471-.914-.452-2.021-.075-2.471.837l-2.2 4.455c-.224.454-.251.978-.079 1.452l1.469 4.005-1.004.779c-.731.71-.747 1.878-.037 2.609.506.518 1.183.639 1.83.433z"/><path fill="#BBDDF5" d="M9.639 19.396c3.667-1.292 5.389-6.467 5.573-7.052.331-1.054-.254-2.177-1.308-2.508-1.053-.331-2.174.252-2.507 1.304-.507 1.588-1.8 4.03-3.088 4.484-1.042.367-1.589 1.509-1.222 2.551.368 1.042 1.51 1.589 2.552 1.221z"/><path fill="#8899A6" d="M34.844 21.326c.228.156.285.467.129.693-.157.228-.468.287-.694.129l-9.062-6.236c-.228-.157-.286-.468-.129-.696.156-.227.468-.285.695-.128l9.061 6.238z"/><path fill="#BBDDF5" d="M27.002 17.521c.791-.279 1.351-1.038 1.335-1.921-.058-3.346-1.616-5.92-4.392-7.249-1.964-.94-3.863-.937-4.073-.933-1.103.019-1.985.929-1.966 2.034.019 1.101.923 1.978 2.022 1.966 1.02-.002 4.342.301 4.409 4.251.02 1.104.93 1.984 2.033 1.965.223-.004.436-.044.632-.113z"/><path fill="#67757F" d="M15.132 16.931c.642 1.824 2.641 2.781 4.464 2.138 1.823-.642 2.78-2.641 2.138-4.464l-1.329-3.773c-.643-1.823-2.641-2.78-4.464-2.138-1.823.643-2.78 2.641-2.138 4.464l1.329 3.773z"/><path fill="#BBDDF5" d="M11.417 12.409c.367 1.042 1.509 1.588 2.551 1.222l6.601-2.327c1.042-.367 1.589-1.509 1.222-2.551-.366-1.042-1.509-1.589-2.551-1.222l-6.602 2.326c-1.04.368-1.587 1.51-1.221 2.552z"/><path fill="#BBDDF5" d="M17 18c-2.614-.366-3.175-1.493-3.244-1.69l-1.15-3.261c-.83-2.358 1.723-3.258 3.414-3.854 1.69-.595 3.61-.074 5.075.863 2.822 1.804 2.347 6.303 2.347 6.303.005.343-.075.859-.171.993-.061.084-2.188 1.218-6.271.646z"/><path fill="#1C6399" d="M29.996 3.938l-1.119-2.653c-.076-.181-.273-.295-.487-.286-.129.006-3.21.174-7.169 3.112-3.748 2.78-4.634 2.82-6.578 2.906l-2.997.133c-.133.006-.257.059-.347.148-.506.498-.615 1.17-.291 1.799.411.796 1.623 1.614 3.795 1.517 1.437-.064 3.482-1.196 5.851-2.507 2.91-1.61 6.208-3.436 8.894-3.555.161-.007.309-.083.396-.205.09-.122.11-.274.052-.409z"/><path fill="#F3D2A2" d="M16.405 4.29c.734 2.083-.36 4.368-2.443 5.102s-4.368-.36-5.102-2.443c-.734-2.084.692-3.425 2.776-4.159 2.083-.735 4.035-.584 4.769 1.5z"/><path fill="#9AAAB4" d="M10.361 6.419c1.886-.665 3.44-2.272 3.772-1.329.333.943.997 2.83 2.883 2.165 1.886-.665.503-7.599-5.156-5.605-5.657 1.994-4.328 5.766-1.499 4.769z"/><path fill="#BDDDF4" d="M11.471 6.559c.275.781-.135 1.638-.917 1.913-.781.275-1.637-.135-1.913-.917-.275-.781.135-1.637.916-1.913.782-.275 1.638.135 1.914.917z"/><path fill="#67757F" d="M10.721 8.943c-1.041.367-2.185-.181-2.552-1.221-.366-1.041.182-2.185 1.222-2.552s2.185.182 2.551 1.222c.367 1.041-.181 2.185-1.221 2.551zm-.997-2.829c-.52.183-.794.755-.611 1.275.183.52.755.794 1.275.611.52-.183.794-.755.611-1.275-.183-.52-.755-.794-1.275-.611z"/><path fill="#BDDDF4" d="M14.3 5.562c.275.781-.135 1.638-.917 1.913-.781.275-1.638-.135-1.913-.916-.275-.782.135-1.638.916-1.914.782-.275 1.639.135 1.914.917z"/><path fill="#67757F" d="M13.55 7.946c-1.04.367-2.184-.182-2.551-1.222s.181-2.185 1.222-2.551c1.04-.366 2.185.182 2.551 1.222.366 1.041-.182 2.185-1.222 2.551zm-.997-2.829c-.52.183-.794.755-.611 1.275.183.52.755.794 1.275.611.52-.183.794-.755.611-1.275-.182-.521-.755-.794-1.275-.611z"/></svg> \ No newline at end of file |