Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts: # locales/index.d.ts # locales/ja-JP.yml # package.json # packages/frontend/src/pages/about.vue # packages/frontend/src/scripts/get-note-menu.ts
This commit is contained in:
commit
69c16f036c
34 changed files with 555 additions and 91 deletions
|
|
@ -379,9 +379,9 @@ export class MiMeta {
|
|||
@Column('varchar', {
|
||||
length: 1024,
|
||||
default: 'https://github.com/misskey-dev/misskey',
|
||||
nullable: false,
|
||||
nullable: true,
|
||||
})
|
||||
public repositoryUrl: string;
|
||||
public repositoryUrl: string | null;
|
||||
|
||||
@Column('varchar', {
|
||||
length: 1024,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue