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/1f99b.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/1f99b.svg')
-rw-r--r-- | public/emoji/1f99b.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f99b.svg b/public/emoji/1f99b.svg new file mode 100644 index 000000000..2764249cb --- /dev/null +++ b/public/emoji/1f99b.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#99AAB5" d="M13 15.689c1.945-.886 7.032-.006 8.304-.048 3.861-.127 6.58-1.305 10.332 0C35.388 16.946 36 20.327 36 24c0 .816-.465-.9-1.008-1.662 0 0 .451 3.643-.854 6.253-.664 1.328-1.631 2.557-1.631 3.753-.001 1.197.493 1.78.493 2.656 0 .892-1 .98-2 .98-.926 0-3 .02-3-.98 0-1.423.385-2.394-.312-2.083-1.729.771-6.146.5-7.771-.167-.766-.314-.43 1.598-.428 1.932C19.499 35.795 19 36 17 36c-1.741 0-3-.012-3-1s.919-2.179.281-3.781C13 28 11 31 7.999 31 5.031 31 13 15.689 13 15.689z"/><path fill="#9AAAB4" d="M3.29 20s3.045-.326 3.915-1.305c.87-.979 2.556-3.535 5.275-3.535s3.045 1.577 4.024 2.066c.978.49 2.91 3.653 1.496 5.774s-6 8-10 8c-4.84 0-5.485-.764-6.281-1.375-.792-.607-1.051-2.042-.344-2.531 0 0-1.312-1-1.131-3.287.185-2.331.707-2.61.707-2.61s.109-.924.653-1.359C2.148 19.402 3.29 20 3.29 20z"/><path fill="#F5F8FA" d="M2.691 29.65c.629.132.992-.253.777-1.4-.657.047-1.663-.816-1.663-.816-.327 1.268.012 2.032.886 2.216z"/><path fill="#67757F" d="M4.601 28.918c-1.148 0-2.333-.432-3.327-1.279-.157-.135-.176-.371-.042-.528.135-.157.372-.177.529-.042 1.306 1.115 3.371 1.657 5.039.354.497-.388.958-1.104 1.446-1.861.912-1.416 1.945-3.033 3.602-2.862.207.02.357.203.337.409-.02.205-.205.353-.409.337-1.212-.127-2.066 1.226-2.9 2.522-.523.812-1.017 1.58-1.614 2.047-.774.604-1.705.903-2.661.903z"/><path fill="#66757F" d="M1.813 20.74c.611-.543 1.694.891 1.318 1.374-.535.687-2.308-.494-1.318-1.374z"/><circle fill="#292F33" cx="10" cy="18.5" r="1"/><path fill="#9AAAB4" d="M8.238 14.889c.095-1.09 1.794-.653 2.175.979s-.42 1.168-.653.598c-.489-1.197-1.631-.327-1.522-1.577zm4.062.598c.258-.84 1.142-1.958 2.338-2.066 1.196-.109 1.523.979 1.088 1.468-.435.489-.979.163-1.305.109s-1.088.489-1.414.979c-.326.489-.924.217-.707-.49z"/></svg> \ No newline at end of file |