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 c1b95838f6
4 changed files with 4 additions and 0 deletions
src/client
assets/room/furnitures/doll-ai
scripts/room

Binary file not shown.

Binary file not shown.

After

(image error) Size: 10 KiB

View file

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