mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 01:46:07 +00:00
merge conflicts solved
This commit is contained in:
parent
d680a4b05f
commit
a8407618bd
@ -21,6 +21,9 @@ export class Community extends BaseEntity {
|
||||
@Column({ name: 'public_key', type: 'binary', length: 32, nullable: false })
|
||||
publicKey: Buffer
|
||||
|
||||
@Column({ name: 'private_key', type: 'binary', length: 64, nullable: true })
|
||||
privateKey: Buffer | null
|
||||
|
||||
@Column({
|
||||
name: 'community_uuid',
|
||||
type: 'char',
|
||||
@ -1 +1 @@
|
||||
export { FederatedCommunity } from './0067-community_tables_public_key_length/FederatedCommunity'
|
||||
export { FederatedCommunity } from './0068-community_tables_public_key_length/FederatedCommunity'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user