Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/common.ts
This commit is contained in:
mattyatea 2023-11-01 05:23:55 +09:00
commit 56ea04cb0b
17 changed files with 220 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/frontend/src/pages/settings/index.vue
View file

@ -23,6 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
</div>
</MkSpacer>
<MkFooterSpacer/>
</mkstickycontainer>
</template>