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/1f935-1f3fd-200d-2642-fe0f.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/1f935-1f3fd-200d-2642-fe0f.svg')
| -rw-r--r-- | public/emoji/1f935-1f3fd-200d-2642-fe0f.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f935-1f3fd-200d-2642-fe0f.svg b/public/emoji/1f935-1f3fd-200d-2642-fe0f.svg new file mode 100644 index 000000000..2268bf01d --- /dev/null +++ b/public/emoji/1f935-1f3fd-200d-2642-fe0f.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#292F33" d="M32 36v-4c0-3.314-2.685-6-6-6H10c-3.313 0-6 2.686-6 6v4h28z"/><path fill="#DFE7EC" d="M20.805 36l2.862-10.017H12.333L15.195 36z"/><path fill="#292F33" d="M18.698 31.846c0 .386-.313.699-.699.699-.386 0-.699-.313-.699-.699 0-.386.313-.699.699-.699.386 0 .699.313.699.699zm0 2.858c0 .386-.313.699-.699.699-.386 0-.699-.313-.699-.699 0-.386.313-.699.699-.699.386 0 .699.312.699.699z"/><path fill="#66757F" d="M23.29 36l-.332-.543 3.542-.974-2.833-8.5L20.805 36zm-10.58 0l.332-.543-3.542-.974 2.833-8.5L15.195 36z"/><path fill="#D4AB88" d="M14 25.887l4 1.75 4-1.75v-4h-8z"/><path fill="#CB9A7A" d="M14 24c1.216 1.374 2.355 1.719 3.996 1.719 1.639 0 2.787-.346 4.004-1.719v-4h-8v4z"/><path fill="#D4AB88" d="M27.833 13.935c0-1.448-.733-2.623-1.639-2.623-.082 0-.161.02-.24.039C24.73 7.546 21.635 4.839 18 4.839s-6.729 2.707-7.955 6.512c-.079-.019-.158-.039-.24-.039-.905 0-1.639 1.175-1.639 2.623 0 1.33.621 2.417 1.423 2.587.634 4.845 4.153 8.557 8.411 8.557s7.776-3.712 8.411-8.557c.802-.17 1.422-1.257 1.422-2.587z"/><path fill="#F4F7F9" d="M13.927 24.744L18 27.637l-2.656 2.818-3.011-4.472zm8.146 0L18 27.637l2.656 2.818 3.011-4.472z"/><path fill="#292F33" d="M21.045 26.653c-.072-.043-.159-.043-.231-.003L18 28.197l-2.814-1.547c-.072-.04-.159-.039-.231.003-.071.042-.115.119-.115.201v3.218c0 .082.044.159.115.201.037.021.078.032.119.032.039 0 .077-.01.112-.029L18 28.728l2.814 1.548c.035.02.073.029.112.029.041 0 .082-.011.119-.032.07-.042.114-.119.114-.201v-3.218c0-.082-.044-.159-.114-.201z"/><path fill="#C1694F" d="M18 21.802c-2.754 0-3.6-.705-3.741-.848-.256-.256-.256-.671 0-.927.248-.248.646-.255.902-.023.052.037.721.487 2.839.487 2.2 0 2.836-.485 2.842-.49.256-.255.657-.243.913.015.256.256.242.683-.014.938-.141.143-.987.848-3.741.848m.75-4.052h-1.5c-.413 0-.75-.337-.75-.75s.337-.75.75-.75h1.5c.413 0 .75.337.75.75s-.337.75-.75.75"/><path fill="#662213" d="M22 15c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1m-8 0c-.55 0-1-.45-1-1v-1c0-.55.45-1 1-1s1 .45 1 1v1c0 .55-.45 1-1 1"/><path fill="#963B22" d="M18 1.48c5.648 0 9.178 4.168 9.178 7.641s-.706 4.863-1.412 3.473l-1.412-2.778s-4.235 0-5.647-1.39c0 0 2.118 4.168-2.118 0 0 0 .706 2.779-3.53-.694 0 0-2.118 1.389-2.824 4.862-.196.964-1.412 0-1.412-3.473C8.822 5.648 11.646 1.48 18 1.48"/></svg> \ No newline at end of file |