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/1f91f-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/1f91f-1f3fc.svg')
| -rw-r--r-- | public/emoji/1f91f-1f3fc.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f91f-1f3fc.svg b/public/emoji/1f91f-1f3fc.svg index 0dff66ba4..13e4bac5c 100644 --- a/public/emoji/1f91f-1f3fc.svg +++ b/public/emoji/1f91f-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(19.1499,1.2319)" id="g20"><path id="path22" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 2.772,1.191 4.574,3.617 5.644,5.956 1.673,3.657 7.582,5.169 9.05,6.211 2.038,1.446 0.166,4.373 -2.864,3.889 C 8.565,15.534 7.777,14.112 5.809,13.252 4.805,12.814 4.096,12.955 3.962,14.808 3.864,16.167 5.618,26.845 6.153,31.768 6.335,33.453 5.634,34.413 4.278,34.594 2.742,34.799 1.947,33.963 1.621,32.424 0.811,28.592 -0.472,21.081 -1.011,20.656 c -2.897,-1.817 -6.758,-4.194 -10.208,0.423 0,0 -1.651,8.661 -1.908,10.409 -0.446,3.027 -4.532,2.481 -4.197,-0.674 0.315,-2.972 1.289,-9.986 0.436,-12.477 -0.75,-2.189 -2.074,-9.701 0.843,-14.277 C -13.168,-0.454 -5.486,-2.357 0,0"/></g><g transform="translate(8.8341,13.3863)" id="g24"><path id="path26" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.865,-4.156 5.886,-3.689 5.569,0.27 5.312,3.49 4.334,9.116 4.017,10.522 3.368,13.399 -1.643,12.761 -1.232,9.363 -0.967,7.157 -0.673,3.234 0,0"/></g><g transform="translate(9.7579,13.8087)" id="g28"><path id="path30" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.795,-3.449 4.429,-2.49 4.244,0.734 4.06,3.959 3.313,8.874 3.085,10.297 2.551,13.624 -1.721,12.126 -1.374,9.676 -1.027,7.226 -0.593,2.572 0,0"/></g><g transform="translate(12.7296,12.4796)" id="g32"><path id="path34" style="fill:#d2a077;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 0.069,-4.943 5.581,-4.674 6.013,-0.974 6.389,2.234 5.595,9.306 5.535,10.748 5.424,13.431 0.521,13.45 0.359,10.403 0.23,7.931 -0.037,2.64 0,0"/></g><g transform="translate(13.6671,12.3341)" id="g36"><path id="path38" style="fill:#f3d2a2;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C -0.141,-3.074 4.014,-3.422 4.315,-0.207 4.617,3.009 4.545,9.882 4.521,11.324 4.48,13.831 0.287,13.743 0.17,10.663 0.075,8.19 0.12,2.637 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F3D2A2" d="M19.15 34.768c2.772-1.191 4.574-3.617 5.644-5.956 1.673-3.657 7.582-5.169 9.05-6.211 2.038-1.446.166-4.373-2.864-3.889-3.265.522-4.053 1.943-6.021 2.804-1.004.438-1.713.297-1.847-1.556-.098-1.359 1.656-12.037 2.19-16.96.183-1.685-.519-2.645-1.875-2.826-1.536-.205-2.331.631-2.656 2.17-.81 3.832-2.094 11.344-2.633 11.768-2.896 1.817-6.757 4.194-10.208-.423 0 0-1.651-8.661-1.908-10.409C5.577.254 1.491.8 1.826 3.955c.314 2.972 1.289 9.985.435 12.476-.75 2.189-2.074 9.702.843 14.277 2.878 4.514 10.56 6.417 16.046 4.06z"/><path fill="#D2A077" d="M8.834 22.614c.865 4.156 5.886 3.689 5.569-.27-.257-3.22-1.235-8.846-1.553-10.252-.648-2.877-5.659-2.238-5.249 1.159.266 2.205.56 6.128 1.233 9.363z"/><path fill="#F3D2A2" d="M9.758 22.191c.795 3.449 4.429 2.49 4.244-.734-.185-3.225-.931-8.139-1.159-9.563-.534-3.326-4.806-1.829-4.459.621s.781 7.104 1.374 9.676z"/><path fill="#D2A077" d="M12.73 23.52c.069 4.943 5.581 4.674 6.013.974.375-3.208-.419-10.28-.478-11.722-.111-2.683-5.015-2.702-5.176.345-.13 2.472-.396 7.764-.359 10.403z"/><path fill="#F3D2A2" d="M13.667 23.666c-.141 3.074 4.014 3.422 4.315.207.302-3.215.23-10.089.206-11.53-.041-2.508-4.234-2.419-4.352.661-.094 2.472-.049 8.025-.169 10.662z"/></svg> \ No newline at end of file |
