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/1f9b6-1f3fb.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/1f9b6-1f3fb.svg')
| -rw-r--r-- | public/emoji/1f9b6-1f3fb.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b6-1f3fb.svg b/public/emoji/1f9b6-1f3fb.svg new file mode 100644 index 000000000..29677fb36 --- /dev/null +++ b/public/emoji/1f9b6-1f3fb.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#F7DECE" d="M34.624 11.009c.322-2.495-10.793-4.379-10.996-2.002-.203 2.377-.247 4.06-1.02 6.958C21.358 20.65 15.954 23 10.583 23H8.895c-.653 0-1.207.426-1.411 1.012-1.024 0-1.646.58-1.646 1.262-.531 0-1.713.508-1.713 1.725 0 0-2.5-.106-2.5 2.5l.002.015c-2.145.606-1.53 4.091.93 4.419 2.334.311 2.428-.369 4.428-.369 1.968 0 2.255.435 4.64.435 4.913 0 4.79-.968 9.447-1.681 5.138-.787 6.406 1.124 9.406 1.124s5.207-2.339 5.207-5.412c0-5-2.059-5.03-2.059-9.03s.676-5.497.998-7.991z"/><path fill="#E0AA94" d="M27.894 23.077c-.262 0-.481-.202-.499-.467-.019-.275.19-.514.466-.532.991-.066 1.563-.676 1.869-1.177.514-.842.655-2.045.329-2.799-.109-.253.007-.548.261-.658.252-.108.547.007.657.26.458 1.059.296 2.587-.394 3.718-.605.992-1.549 1.579-2.656 1.653-.011.002-.022.002-.033.002zM6.766 28H4.069c-.825 0-1.927.476-1.927 1.301 0 .005.627-.249 1.886-.249l2.738.001c.291 0 .526-.236.526-.526 0-.291-.235-.527-.526-.527zm.897-1.839H5.858c-.544 0-1.006.352-1.18.839h2.985c.231 0 .419-.189.419-.419.001-.231-.188-.42-.419-.42zm.884-1.445H7.133c-.362 0-.669.234-.785.558h2.199c.153 0 .279-.126.279-.279 0-.153-.126-.279-.279-.279zm.732-1.034h-.797c-.214 0-.396.139-.465.33h1.262c.091 0 .165-.074.165-.165 0-.091-.074-.165-.165-.165z"/></svg> \ No newline at end of file |