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/1f9b4.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/1f9b4.svg')
-rw-r--r-- | public/emoji/1f9b4.svg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/public/emoji/1f9b4.svg b/public/emoji/1f9b4.svg new file mode 100644 index 000000000..624de728f --- /dev/null +++ b/public/emoji/1f9b4.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFE8B6" d="M34.345 24.615c-1.582-.977-4.292.715-5.675-.668-.877-.877-7.984-8.516-11.111-11.493S10.937 6.8 10.12 6.065c-.477-.429 1.076-3.55-.238-4.864C8.488-.192 6.566-.348 5.173 1.045c-.856.855-.461 2.285-1.062 2.683s-2.212.59-3.066 1.445c-1.393 1.392-1.191 3.683.396 4.85 1.621 1.192 4.053-.095 5.007.191 1.301.39 4.734 4.223 9.347 8.822 4.303 4.29 7.882 9.171 8.25 9.585.763.858-1.478 3.767.668 6.152 1.318 1.464 3.71 1.489 5.103.095.856-.854.806-3.721 1.574-4.292s2.53-.051 3.386-.906c1.391-1.392 1.19-4.053-.431-5.055z"/><path fill="#F2C994" d="M5.113 3.013C5.208 1.868 6.544.295 8.022.438c1.478.143 2.003 1.669 1.86 2.48-.144.81-.382 1.573-.478 2.193-.095.62-.143 1.097 1.097 2.003s11.397 10.157 13.734 12.971c2.337 2.814 3.72 4.578 4.673 4.816.954.238 1.812.143 2.718 0 .847-.134 2.847-.575 3.729.885-.227-.475-.557-.891-1.01-1.171-1.582-.977-4.292.715-5.675-.668-.877-.877-7.984-8.516-11.111-11.493-3.127-2.977-6.622-5.655-7.439-6.39-.477-.429 1.076-3.55-.238-4.864C8.488-.192 6.566-.348 5.173 1.045c-.856.855-.461 2.285-1.062 2.683-.14.093-.34.175-.568.257.953-.055 1.494-.06 1.57-.972z"/><path fill="#D99E82" d="M35.537 27.953c-.143 1.24-2.48 2.146-3.958 1.669-.873-.282-1.717-.143-1.621.763.095.906.238 2.241-.286 3.29-.477.954-2.48 1.431-3.767.525-1.186-.835-1.383-2.957-.858-3.958.525-1.001.572-1.669-.668-3.195-.628-.773-4.109-4.765-8.011-8.87-3.801-3.998-7.593-7.828-8.393-8.393-1.623-1.144-2.466-.662-3.625-.381-1.574.381-3.1-.715-3.386-1.431-.255-.639-.228-2.13.243-2.933-.054.045-.113.085-.162.134-1.393 1.392-1.191 3.683.396 4.85 1.621 1.192 4.053-.095 5.007.191 1.301.39 4.734 4.223 9.347 8.822 4.303 4.29 7.882 9.171 8.25 9.585.763.858-1.478 3.767.668 6.152 1.318 1.464 3.71 1.489 5.103.095.855-.854.806-3.721 1.574-4.292.767-.571 2.53-.051 3.386-.906.558-.557.848-1.317.906-2.093-.065.026-.118.142-.145.376z"/></svg> \ No newline at end of file |