Merge branch 'master' into develop
[oweals/peertube.git] / server / controllers / api / videos / captions.ts
2018-11-13 ChocobozzzMerge branch 'master' into develop
2018-10-19 ChocobozzzMerge branch 'release/v1.0.0' into develop
2018-10-11 ChocobozzzMerge branch 'release/v1.0.0' into develop
2018-10-08 ChocobozzzMerge branch 'release/v1.0.0' into develop
2018-10-05 ChocobozzzAdd user history and resume videos
2018-07-16 ChocobozzzHandle .srt subtitles
2018-07-16 ChocobozzzImplement captions/subtitles