Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-05-16 23:51:32 +09:00
commit 8756b6ca60
4 changed files with 13 additions and 0 deletions

BIN
src/client/assets/room/furnitures/doll-ai/doll-ai.blend (Stored with Git LFS) Normal file

Binary file not shown.

BIN
src/client/assets/room/furnitures/doll-ai/doll-ai.glb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -395,5 +395,9 @@
{ {
id: 'energy-drink', id: 'energy-drink',
place: "floor", place: "floor",
},
{
id: 'doll-ai',
place: "floor",
} }
] ]