limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-26 03:47:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop

Browse source
This commit is contained in:
ThatOneCalculator 2022-09-14 10:20:59 -07:00
commit e730e42831
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -14,8 +14,8 @@ services:
- internal_network - internal_network
- external_network - external_network
volumes: volumes:
- ./files:/misskey/files - ./files:/calckey/files
- ./.config:/misskey/.config:ro - ./.config:/calckey/.config:ro
redis: redis:
restart: always restart: always

2
packages/client/src/pages/user/index.vue
View file

@ -31,8 +31,6 @@
</div> </div>
<MkError v-else-if="error" @retry="fetchUser()"/> <MkError v-else-if="error" @retry="fetchUser()"/>
<MkLoading v-else/> <MkLoading v-else/>
</swiper>
</div>
</MkStickyContainer> </MkStickyContainer>
</template> </template>