Merge branch 'release/v1.0.0' into develop
[oweals/peertube.git] / client / src / assets / player / peertube-load-progress-bar.ts
2018-05-31 ChocobozzzRemove bad import
2018-05-31 ChocobozzzFix player progress bar