Resolve conflicts
This commit is contained in:
parent
281b388e39
commit
bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
|
|
@ -48,7 +48,7 @@ export default define({
|
|||
this.fetching = true;
|
||||
|
||||
(this as any).api('channels/show', {
|
||||
channel_id: this.props.channel
|
||||
channelId: this.props.channel
|
||||
}).then(channel => {
|
||||
this.channel = channel;
|
||||
this.fetching = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue