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/1f940.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/1f940.svg')
-rw-r--r-- | public/emoji/1f940.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f940.svg b/public/emoji/1f940.svg index 08d5986de..dedff2088 100644 --- a/public/emoji/1f940.svg +++ b/public/emoji/1f940.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(22.7813,31.2852)" id="g20"><path id="path22" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 -5.69,7.14 -10.656,3.697 -3.683,-2.554 -3.667,-7.228 -3.304,-9.478 0.371,-2.298 1.504,-7.529 2.194,-11.914 0.69,-4.397 1.178,-8.329 1.893,-12.912 0.182,-1.16 4.069,-0.522 3.965,0.613 -0.177,1.944 -1.821,8.965 -2.258,12.05 -0.404,2.865 -1.365,8.421 -1.928,11.649 -0.619,3.546 -0.28,6.676 2.148,7.39 2.787,0.819 5.55,-3.835 5.55,-3.835 L 0,0 Z"/></g><g transform="translate(13.0811,19.5747)" id="g24"><path id="path26" style="fill:#c6e4b5;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0,0 1.71,-0.642 2.871,-1.803 1.536,-1.536 2.471,-4.541 1.269,-7.948 -0.739,-2.092 1.069,-5.074 1.069,-5.074 0,0 -2.013,1.077 -3.272,2.671 -1.279,1.618 -2.12,3.833 -2.297,5.648 C -0.477,-5.309 -0.534,-2.938 0,0"/></g><g transform="translate(10.2759,22.0229)" id="g28"><path id="path30" style="fill:#a6d388;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.786,-0.363 -2.993,-3.198 -3.242,-4.768 -1.037,-6.55 2.879,-10.825 2.879,-10.825 0,0 0.688,3.983 1.761,5.421 1.245,1.67 0.545,5.676 0,7.151 C 1.007,-1.967 0,0 0,0"/></g><g transform="translate(24.7354,27.7422)" id="g32"><path id="path34" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.786,-1.067 -2.577,-1.082 -3.999,-0.033 -5.422,1.015 -5.937,2.73 -5.15,3.797 -4.365,4.864 -2.574,4.879 -1.151,3.83 0.271,2.782 0.786,1.067 0,0"/></g><g transform="translate(26.2051,30.6299)" id="g36"><path id="path38" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 0.845,-1.281 0.107,-3.255 -1.645,-4.41 -1.752,-1.154 -3.858,-1.052 -4.702,0.229 -0.842,1.28 -0.106,3.254 1.647,4.409 C -2.947,1.383 -0.844,1.281 0,0"/></g><g transform="translate(20.71,27.8564)" id="g40"><path id="path42" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.874,-1.148 -2.897,-1.476 -2.897,-1.476 0,0 1.695,-1.257 2.733,-0.546 C 0.874,-1.312 0,0 0,0"/></g><g transform="translate(23.2607,31.1357)" id="g44"><path id="path46" style="fill:#78b159;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.055,0.82 1.312,2.295 1.967,1.913 0,0 -0.874,-0.984 -0.054,-1.585 C 2.732,-0.273 0,0 0,0"/></g><g transform="translate(21.25,27.3335)" id="g48"><path id="path50" style="fill:#da2f47;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -1.791,-0.958 -3.399,-3.232 -2.56,-7.593 0.726,-3.774 3.918,-5.321 2.855,-7.836 -0.986,-2.335 0.822,-6.097 3.228,-0.392 0.754,1.788 2.811,9.279 0.769,13.863 C 3.064,0.798 0.838,0.449 0,0"/></g><g transform="translate(23.3535,28.9204)" id="g52"><path id="path54" style="fill:#e75a70;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.322,1.933 3.245,2.175 4.541,0.946 10.575,-4.777 8.085,-16.001 4.021,-18.42 1.618,-19.85 3.175,-11.211 -0.067,-7.68 -1.973,-5.604 -2.026,-2.409 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#78B159" d="M22.781 4.715s-5.691-7.14-10.656-3.697c-3.683 2.554-3.667 7.228-3.304 9.478.371 2.298 1.505 7.529 2.194 11.915.69 4.396 1.178 8.329 1.894 12.912.181 1.159 4.068.521 3.964-.613-.177-1.944-1.821-8.965-2.257-12.05-.405-2.865-1.366-8.421-1.929-11.649-.619-3.546-.279-6.676 2.148-7.39 2.787-.819 5.551 3.835 5.551 3.835l2.395-2.741z"/><path fill="#C6E4B5" d="M13.081 16.425s1.71.642 2.871 1.803c1.536 1.536 2.471 4.541 1.269 7.947-.739 2.093 1.069 5.074 1.069 5.074s-2.013-1.077-3.272-2.671c-1.279-1.618-2.12-3.833-2.297-5.647-.117-1.197-.174-3.568.36-6.506"/><path fill="#A6D388" d="M10.276 13.977c-.786.363-2.993 3.198-3.242 4.768-1.037 6.55 2.879 10.825 2.879 10.825s.688-3.983 1.761-5.421c1.245-1.67.545-5.677 0-7.151-.391-1.054-1.398-3.021-1.398-3.021"/><path fill="#78B159" d="M24.735 8.258c-.786 1.067-2.577 1.082-3.999.033-1.423-1.048-1.938-2.763-1.151-3.83.785-1.067 2.576-1.082 3.999-.033 1.423 1.048 1.937 2.763 1.151 3.83"/><path fill="#78B159" d="M26.205 5.37c.845 1.281.107 3.255-1.645 4.41-1.752 1.154-3.858 1.052-4.701-.229-.843-1.28-.106-3.254 1.646-4.409 1.753-1.155 3.856-1.053 4.7.228"/><path fill="#78B159" d="M20.71 8.144c-.874 1.148-2.897 1.476-2.897 1.476s1.695 1.257 2.733.546c1.038-.71.164-2.022.164-2.022m2.551-3.28c-.055-.82 1.312-2.295 1.967-1.913 0 0-.874.984-.054 1.585.819.601-1.913.328-1.913.328"/><path fill="#DA2F47" d="M21.25 8.667c-1.791.958-3.399 3.232-2.56 7.593.726 3.774 3.918 5.321 2.855 7.836-.986 2.335.822 6.097 3.228.392.755-1.788 2.812-9.279.77-13.862-1.23-2.757-3.455-2.408-4.293-1.959z"/><path fill="#E75A70" d="M23.354 7.08c1.322-1.933 3.245-2.175 4.541-.946 6.034 5.724 3.544 16.948-.52 19.367-2.403 1.43-.847-7.209-4.089-10.74-1.905-2.077-1.959-5.273.068-7.681"/></svg> \ No newline at end of file |