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/1f950.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/1f950.svg')
-rw-r--r-- | public/emoji/1f950.svg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public/emoji/1f950.svg b/public/emoji/1f950.svg index 4c325029a..eef4358d8 100644 --- a/public/emoji/1f950.svg +++ b/public/emoji/1f950.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><clipPath id="clipPath28" clipPathUnits="userSpaceOnUse"><path id="path30" d="M 6.341,29.165 C 0.636,23.46 0.952,15.224 3.444,9.005 l 0,0 C 3.608,8.594 4.527,8.311 4.71,7.921 l 0,0 C 6.207,4.7 9.346,1.219 11.57,0.589 l 0,0 c 2.22,-0.629 2.196,0.528 1.6,2.322 l 0,0 C 12.487,4.966 11.054,7.857 11.398,9.85 l 0,0 c 0.113,0.66 0.684,0.475 0.73,1.283 l 0,0 c 0.415,7.285 3.652,13.34 12.81,14.256 l 0,0 c 0.925,0.093 2.797,0.194 3.565,0.304 l 0,0 c 0.493,0.07 1.107,0.914 1.543,0.962 l 0,0 c 1.158,0.129 2.616,-0.086 3.816,-0.428 l 0,0 c 2.563,-0.733 0.157,5.701 -5.76,6.817 l 0,0 c -0.449,0.084 -0.836,1.051 -1.286,1.198 l 0,0 c -1.991,0.651 -4.135,1.023 -6.338,1.023 l 0,0 c -4.742,0 -9.76,-1.724 -14.137,-6.1"/></clipPath><clipPath id="clipPath48" clipPathUnits="userSpaceOnUse"><path id="path50" 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(11.5693,0.5898)" id="g20"><path id="path22" style="fill:#f4900c;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -2.223,0.63 -5.362,4.11 -6.86,7.331 -0.182,0.391 -1.101,0.673 -1.265,1.084 -2.492,6.22 -2.808,14.455 2.897,20.161 6.41,6.409 14.196,7.129 20.475,5.076 0.45,-0.147 0.837,-1.113 1.286,-1.198 5.917,-1.115 8.322,-7.549 5.759,-6.817 -1.199,0.343 -2.657,0.557 -3.814,0.428 -0.437,-0.048 -1.051,-0.891 -1.544,-0.961 -0.768,-0.11 -2.64,-0.212 -3.565,-0.305 C 4.21,23.883 0.974,17.828 0.559,10.543 0.513,9.735 -0.058,9.92 -0.172,9.26 -0.516,7.268 0.917,4.376 1.6,2.32 2.196,0.527 2.221,-0.63 0,0"/></g></g></g><g id="g24"><g clip-path="url(#clipPath28)" id="g26"><g transform="translate(0.894,18.2954)" id="g32"><path id="path34" style="fill:#db7803;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 3.043,1.972 7.674,4.03 16.505,-0.814 24.908,-5.423 16.934,5.402 13.676,6.173 10.418,6.945 3.345,9.518 0.686,7.074 -1.973,4.63 0,0 0,0"/></g><g transform="translate(3.4663,8.1777)" id="g36"><path id="path38" style="fill:#db7803;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 1.543,1.458 3.293,3.902 8.91,2.573 15.428,1.029 11.661,0.643 9.088,1.071 6.516,1.501 2.958,0.729 0.643,-0.9 -1.672,-2.529 0,0 0,0"/></g><g transform="translate(27.0322,34.7153)" id="g40"><path id="path42" style="fill:#db7803;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 1.028,-2.229 2.887,-6.174 1.386,-9.561 -1.502,-3.386 0.655,-1.155 1.457,0.215 1.028,1.758 0.168,6.632 -2.114,9.089 C -1.489,2.13 -0.055,0.117 0,0"/></g></g></g><g id="g44"><g clip-path="url(#clipPath48)" id="g46"><g transform="translate(2.0381,21.085)" id="g52"><path id="path54" style="fill:#ffac33;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c -0.955,3.252 0.381,12.621 12.621,14.915 2.133,0 10.133,-1.272 6.526,-16.257 C 18.588,-3.667 17.351,-4.081 15.585,-2.947 11.46,-0.299 3.984,4.152 0,0"/></g></g></g></g></svg> +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F4900C" d="M11.569 35.41c-2.223-.63-5.362-4.11-6.86-7.331-.183-.391-1.101-.673-1.265-1.084C.953 20.775.637 12.54 6.342 6.834 12.751.425 20.537-.295 26.817 1.757c.45.147.837 1.114 1.286 1.199 5.917 1.115 8.322 7.549 5.759 6.816-1.199-.342-2.657-.557-3.814-.428-.437.049-1.051.892-1.544.962-.767.11-2.64.212-3.564.305-9.159.916-12.395 6.971-12.811 14.256-.046.808-.617.623-.73 1.283-.344 1.992 1.089 4.884 1.772 6.939.594 1.794.619 2.951-1.602 2.321z"/><path fill="#DB7803" d="M4.128 9.652c-1.439 2.333-2.158 4.906-2.333 7.505 2.615-1.499 6.334-2.652 12.393-.18.779-1.397 1.806-2.623 3.124-3.624-.992-.932-1.992-1.645-2.742-1.822-2.481-.588-7.17-2.213-10.442-1.879zm-.251 17.769c.324.215.719.416.832.658.032.069.069.139.103.209 1.92-1.11 4.42-1.707 6.553-1.642.006-.167.005-.339.032-.496.095-.552.506-.52.667-.965-4.887-1.059-6.75.812-8.187 2.236zM28.899 3.157c-.26-.074-.52-.148-.796-.2-.169-.032-.33-.19-.489-.382.918 2.123 1.899 5.032 1.024 7.689.467-.178 1.011-.875 1.409-.919.067-.007.143-.003.211-.008.206-1.704-.284-4.207-1.359-6.18z"/><path fill="#FFAC33" d="M2.038 14.915C1.084 11.663 2.419 2.294 14.659 0c2.133 0 10.133 1.272 6.527 16.257-.559 2.325-1.797 2.739-3.562 1.605-4.126-2.648-11.602-7.099-15.586-2.947z"/></svg> \ No newline at end of file |