diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 14:09:23 +0100 |
| commit | b718fd22374d64534bcfe69932cf562894abed6a (patch) | |
| tree | 311d3c67e2a4d1f33ebdd1dc163527de9d33d0f7 /client/src/app/+video-channels | |
| parent | adb115f5522bea4d52456a9fc5eb4140bb064476 (diff) | |
| parent | 501e961199578129629cf0567033d13efced9904 (diff) | |
| download | PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.gz PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.tar.zst PeerTube-b718fd22374d64534bcfe69932cf562894abed6a.zip | |
Merge branch 'develop' into pr/1285
Diffstat (limited to 'client/src/app/+video-channels')
| -rw-r--r-- | client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts index ea7b0e118..895b19064 100644 --- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts +++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts | |||
| @@ -3,7 +3,7 @@ import { VideoChannelService } from '@app/shared/video-channel/video-channel.ser | |||
| 3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
| 4 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { I18n } from '@ngx-translate/i18n-polyfill' |
| 5 | import { Subscription } from 'rxjs' | 5 | import { Subscription } from 'rxjs' |
| 6 | import { MarkdownService } from '@app/videos/shared' | 6 | import { MarkdownService } from '@app/shared/renderer' |
| 7 | 7 | ||
| 8 | @Component({ | 8 | @Component({ |
| 9 | selector: 'my-video-channel-about', | 9 | selector: 'my-video-channel-about', |