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/1f4ae.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/1f4ae.svg')
-rw-r--r-- | public/emoji/1f4ae.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f4ae.svg b/public/emoji/1f4ae.svg index be4d94192..7f8b52870 100644 --- a/public/emoji/1f4ae.svg +++ b/public/emoji/1f4ae.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(15.6323,1.3389)" id="g20"><path id="path22" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.799,0.597 -1.497,1.484 -2.035,2.592 l -0.228,0.47 -0.46,-0.249 C -3.698,2.284 -4.636,1.954 -5.467,1.844 L -5.669,5.6 -9.305,4.632 c -0.157,0.854 -0.125,1.887 0.097,3.021 l 0.102,0.526 -0.532,0.066 c -1.242,0.154 -2.305,0.526 -3.103,1.08 l 1.521,2.917 -2.988,1.524 c 0.319,0.944 0.947,1.881 1.834,2.735 l 0.377,0.362 -0.379,0.36 c -0.804,0.764 -1.408,1.554 -1.77,2.311 l 3.51,1.353 -2.045,3.159 c 0.741,0.402 1.694,0.686 2.789,0.831 l 0.518,0.069 -0.091,0.514 c -0.216,1.211 -0.172,2.338 0.124,3.288 l 3.308,-0.523 0.524,3.307 c 0.988,-0.012 2.08,-0.325 3.164,-0.907 l 0.462,-0.247 0.226,0.473 c 0.478,1.003 1.044,1.824 1.653,2.404 l 2.372,-2.92 2.372,2.92 c 0.609,-0.58 1.175,-1.401 1.653,-2.404 l 0.226,-0.473 0.462,0.247 c 1.085,0.581 2.177,0.894 3.164,0.906 l 0.523,-3.308 3.31,0.525 c 0.296,-0.951 0.34,-2.078 0.124,-3.288 l -0.092,-0.515 0.518,-0.069 c 1.095,-0.145 2.048,-0.43 2.789,-0.832 l -2.046,-3.155 3.51,-1.355 C 18.52,18.776 17.916,17.986 17.112,17.223 L 16.733,16.863 17.11,16.5 c 0.888,-0.854 1.516,-1.793 1.835,-2.736 L 15.961,12.244 17.482,9.26 C 16.67,8.686 15.611,8.296 14.388,8.126 L 13.871,8.054 13.966,7.54 C 14.168,6.451 14.192,5.457 14.04,4.631 L 10.406,5.601 10.202,1.844 C 9.372,1.954 8.434,2.284 7.46,2.812 L 7.001,3.061 6.772,2.591 C 6.233,1.483 5.535,0.597 4.736,0 L 2.368,2.368 0,0 Z"/></g><g transform="translate(7.0918,25.3223)" id="g24"><path id="path26" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.53,1.489 -0.698,2.97 -0.432,4.2 L 1.936,3.825 2.923,3.669 3.08,4.657 3.455,7.024 C 4.715,6.897 6.067,6.282 7.316,5.319 7.435,5.656 7.561,5.981 7.699,6.286 6.148,7.421 4.476,8.049 2.968,8.049 2.845,8.049 2.724,8.045 2.603,8.037 L 2.092,4.813 -1.132,5.323 C -1.732,3.836 -1.697,1.908 -1.047,-0.07 -0.712,-0.032 -0.362,-0.009 0,0"/></g><g transform="translate(21.5928,30.6406)" id="g28"><path id="path30" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.248,0.962 2.6,1.578 3.86,1.705 l 0.376,-2.368 0.157,-0.988 0.987,0.156 2.369,0.376 c 0.266,-1.23 0.098,-2.71 -0.432,-4.199 0.362,-0.01 0.711,-0.033 1.046,-0.071 0.652,1.979 0.686,3.907 0.085,5.394 L 5.224,-0.507 4.713,2.717 C 4.593,2.726 4.471,2.729 4.348,2.729 2.841,2.73 1.169,2.102 -0.383,0.967 -0.244,0.663 -0.118,0.337 0,0"/></g><g transform="translate(7.3677,9)" id="g32"><path id="path34" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 0.035,0 C 0.102,0 0.191,0.604 0.294,0.947 0.196,0.943 0.098,0.901 0,0.901 c -1.496,0 -2.826,0.303 -3.83,0.89 l 1.089,2.128 0.453,0.887 -0.89,0.452 -2.136,1.088 c 0.508,1.151 1.515,2.249 2.818,3.142 -0.287,0.219 -0.56,0.442 -0.81,0.67 C -4.992,8.94 -6.151,7.402 -6.541,5.848 L -3.632,4.365 -5.114,1.523 C -3.893,0.499 -2.065,0 0,0"/></g><g transform="translate(35.1738,14.8457)" id="g36"><path id="path38" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.39,1.555 -1.548,3.093 -3.234,4.311 -3.484,4.083 -3.757,3.86 -4.044,3.642 -2.74,2.749 -1.734,1.649 -1.227,0.497 l -2.135,-1.088 -0.891,-0.453 0.454,-0.892 1.089,-2.136 c -1.004,-0.587 -2.332,-0.905 -3.828,-0.905 -0.099,0 -0.199,0.01 -0.299,0.013 0.103,-0.344 0.192,-0.682 0.26,-1.011 0.013,0 0.026,-0.002 0.039,-0.002 2.065,0 3.892,0.564 5.112,1.587 L -2.908,-1.481 0,0 Z"/></g><g transform="translate(22.5215,5.6641)" id="g40"><path id="path42" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.447,-1.517 -1.181,-2.813 -2.119,-3.651 l -1.695,1.694 -0.707,0.707 -0.708,-0.707 -1.694,-1.694 c -0.939,0.838 -1.673,2.135 -2.12,3.652 -0.296,-0.206 -0.593,-0.397 -0.886,-0.563 0.636,-1.981 1.741,-3.559 3.1,-4.41 l 2.308,2.308 2.307,-2.308 c 1.359,0.851 2.464,2.428 3.101,4.409 C 0.593,-0.396 0.297,-0.205 0,0"/></g><g transform="translate(20.3076,35.3081)" id="g44"><path id="path46" style="fill:#ea596e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 -2.308,-2.841 -4.615,0 c -1.99,-1.533 -3.421,-4.993 -3.647,-9.112 -1.616,0.429 -3.192,0.636 -4.632,0.636 -2.11,0.001 -3.929,-0.445 -5.161,-1.288 l 1.99,-3.073 -3.415,-1.317 c 0.842,-2.366 3.69,-4.797 7.539,-6.283 -2.241,-3.465 -3.116,-7.107 -2.407,-9.516 l 3.537,0.942 0.197,-3.655 c 2.511,0.071 5.703,2.028 8.306,5.229 2.603,-3.201 5.796,-5.158 8.306,-5.229 l 0.198,3.656 3.536,-0.944 c 0.709,2.411 -0.166,6.05 -2.405,9.517 3.849,1.485 6.696,3.917 7.538,6.283 l -3.415,1.318 1.99,3.07 c -1.233,0.845 -3.052,1.29 -5.164,1.29 -1.438,0 -3.012,-0.207 -4.63,-0.636 C 3.422,-4.992 1.989,-1.532 0,0 m -0.189,-4.991 c 0.425,-1.146 0.748,-2.596 0.84,-4.284 l 0.201,-3.683 3.564,0.947 c 1.32,0.35 2.655,0.535 3.86,0.535 0.16,0 0.319,-0.003 0.474,-0.01 l -1.827,-2.819 3.138,-1.211 c -0.957,-0.759 -2.237,-1.513 -3.814,-2.122 l -3.441,-1.328 2.001,-3.099 c 0.918,-1.42 1.508,-2.782 1.838,-3.96 L 3.4,-25.16 3.219,-28.517 c -1.019,0.677 -2.132,1.66 -3.199,2.973 l -2.327,2.862 -2.328,-2.862 c -1.067,-1.312 -2.179,-2.295 -3.198,-2.972 l -0.18,3.353 -3.248,-0.864 c 0.329,1.178 0.921,2.54 1.839,3.961 l 2.004,3.099 -3.442,1.329 c -1.577,0.609 -2.856,1.363 -3.815,2.121 l 3.135,1.209 -1.827,2.823 c 0.156,0.006 0.314,0.009 0.473,0.009 1.207,0 2.541,-0.185 3.862,-0.536 l 3.564,-0.947 0.202,3.683 c 0.092,1.688 0.414,3.138 0.84,4.284 l 2.118,-2.608 2.119,2.609"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFF" d="M15.632 34.661c-.799-.597-1.498-1.484-2.035-2.592l-.228-.47-.46.249c-.975.528-1.913.858-2.744.969l-.202-3.756-3.636.968c-.157-.854-.125-1.887.096-3.022l.103-.525-.532-.066c-1.242-.154-2.306-.525-3.104-1.08l1.521-2.917-2.988-1.523c.319-.944.948-1.882 1.834-2.735l.377-.363-.379-.36c-.803-.764-1.408-1.554-1.77-2.311l3.51-1.353-2.045-3.159c.74-.402 1.693-.686 2.789-.832l.519-.068-.091-.514c-.215-1.211-.172-2.338.124-3.288l3.308.523.524-3.308c.988.013 2.08.326 3.164.907l.462.248.226-.473c.479-1.003 1.044-1.824 1.653-2.404L18 4.326l2.372-2.92c.609.58 1.175 1.401 1.653 2.404l.226.473.462-.247c1.085-.581 2.178-.894 3.164-.906l.523 3.308 3.31-.525c.296.951.34 2.078.124 3.288l-.092.515.518.069c1.095.145 2.048.43 2.788.832l-2.046 3.156 3.511 1.355c-.361.757-.966 1.547-1.77 2.311l-.379.36.377.363c.888.854 1.516 1.793 1.835 2.736l-2.984 1.52 1.521 2.984c-.812.574-1.871.964-3.094 1.134l-.518.072.096.514c.201 1.089.226 2.083.073 2.909l-3.634-.97-.204 3.757c-.83-.11-1.768-.44-2.742-.968l-.459-.249-.228.47c-.539 1.107-1.237 1.994-2.036 2.591L18 32.293l-2.368 2.368z"/><path d="M7.092 10.678c-.53-1.489-.698-2.97-.432-4.2l2.368.375.987.156.157-.988.375-2.368c1.261.127 2.613.743 3.862 1.706.118-.337.244-.663.382-.967-1.551-1.135-3.223-1.763-4.73-1.763-.123 0-.245.004-.366.013l-.511 3.223-3.224-.511c-.6 1.487-.565 3.415.085 5.393.335-.037.684-.061 1.047-.069zm14.501-5.319c1.248-.962 2.6-1.578 3.86-1.705l.376 2.368.156.988.987-.157 2.369-.376c.266 1.23.098 2.71-.432 4.2.361.009.711.032 1.046.07.651-1.978.685-3.906.085-5.394l-3.225.512-.511-3.224c-.12-.008-.242-.012-.365-.012-1.507 0-3.179.628-4.73 1.762.14.306.266.631.384.968zM7.368 27h.035c.067 0 .157-.604.26-.947-.098.004-.197.046-.294.046-1.496 0-2.826-.303-3.83-.89l1.089-2.128.454-.887-.891-.452-2.136-1.088c.508-1.151 1.515-2.25 2.818-3.143-.287-.219-.561-.441-.81-.669-1.687 1.217-2.846 2.755-3.235 4.31l2.908 1.483-1.482 2.843C3.475 26.501 5.303 27 7.368 27zm27.806-5.846c-.39-1.555-1.548-3.093-3.234-4.311-.25.228-.523.451-.81.669 1.304.893 2.31 1.992 2.817 3.145l-2.136 1.088-.891.453.454.892 1.089 2.137c-1.004.587-2.332.904-3.828.904-.099 0-.199-.01-.299-.013.103.344.192.683.26 1.011l.039.002c2.066 0 3.892-.563 5.112-1.587l-1.482-2.908 2.909-1.482zm-12.653 9.182c-.447 1.517-1.181 2.812-2.119 3.651l-1.695-1.694-.707-.707-.707.707-1.695 1.694c-.938-.839-1.673-2.136-2.12-3.652-.296.206-.593.397-.886.563.636 1.98 1.741 3.559 3.1 4.409L18 33l2.308 2.308c1.358-.851 2.464-2.428 3.101-4.408-.295-.168-.591-.359-.888-.564z" fill="#EA596E"/><path fill="#EA596E" d="M20.118 5.683c.426 1.146.748 2.596.841 4.284l.2 3.683 3.564-.946c1.32-.351 2.655-.536 3.86-.536.16 0 .318.003.474.01l-1.827 2.819 3.139 1.211c-.958.759-2.237 1.514-3.814 2.123l-3.441 1.328 2.001 3.099c.918 1.42 1.509 2.782 1.838 3.96l-3.244-.865-.182 3.357c-1.019-.677-2.132-1.66-3.198-2.973L18 23.374l-2.328 2.862c-1.066 1.312-2.179 2.295-3.198 2.972l-.18-3.354-3.248.864c.329-1.178.921-2.54 1.839-3.961l2.004-3.099-3.442-1.328c-1.577-.609-2.856-1.363-3.814-2.122L8.768 15l-1.827-2.823c.155-.006.313-.01.473-.01 1.206 0 2.541.185 3.861.536l3.564.947.202-3.683c.092-1.688.415-3.138.84-4.284L18 8.292l2.118-2.609m.19-4.991L18 3.533 15.692.692c-1.989 1.532-3.421 4.992-3.646 9.112-1.617-.43-3.192-.637-4.632-.637-2.11 0-3.929.445-5.161 1.289l1.989 3.073-3.415 1.316c.842 2.366 3.69 4.797 7.54 6.283-2.241 3.465-3.116 7.106-2.407 9.516l3.537-.941.196 3.654c2.512-.07 5.703-2.027 8.307-5.228 2.603 3.201 5.796 5.158 8.306 5.228l.198-3.655 3.535.943c.71-2.411-.165-6.05-2.404-9.517 3.849-1.485 6.696-3.918 7.538-6.283l-3.415-1.318 1.99-3.07c-1.233-.844-3.053-1.29-5.164-1.29-1.438 0-3.013.207-4.63.636-.225-4.119-1.657-7.579-3.646-9.111z"/></svg> \ No newline at end of file |