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/1f9b5-1f3fd.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/1f9b5-1f3fd.svg')
-rw-r--r-- | public/emoji/1f9b5-1f3fd.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b5-1f3fd.svg b/public/emoji/1f9b5-1f3fd.svg new file mode 100644 index 000000000..dce4696fa --- /dev/null +++ b/public/emoji/1f9b5-1f3fd.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#D5AB88" d="M24.854.731c3.633 1.239 4.935 8.505.991 10.297-1.586.72-4.049 1.511-6.185 1.032-2.737-.613-4.721-.238-4.721-.238s4.797 2.19 6.339 6.323c1.542 4.133 1.072 7.171 3.235 9.163 1.708 1.573 2.79 3.7 1.639 4.994-1.545 1.738-3.929-.028-6.1 2.48-1.522 1.758-4.81 1.182-7.088.142-2.879-1.314.807-2.191 1.842-2.297 1.15-.117 5.29-2.348 3.33-5.544-4.196-6.841-8.501-10.544-11.313-12.61-2.514-1.846-2.772-5.313-.147-8.465 1.662-1.996 5.229-3.554 9.253-4.733 2.8-.821 5.973-1.551 8.925-.544z"/><path fill="#B78B60" d="M8.267 13.047l-.042-.02c-.381-.202-.526-.674-.324-1.054 1.154-2.179.472-3.999.443-4.076-.155-.4.041-.852.44-1.01.398-.157.849.033 1.009.432.041.102.993 2.541-.513 5.383-.194.367-.64.515-1.013.345z"/></svg> \ No newline at end of file |