Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils...
authorbuoyantair <buoyantair@protonmail.com>
Tue, 20 Nov 2018 06:58:13 +0000 (12:28 +0530)
committerbuoyantair <buoyantair@protonmail.com>
Tue, 20 Nov 2018 06:58:13 +0000 (12:28 +0530)
commitbc22d60899e14631cba0fb6450f4e85fc9528293
tree285fa55033bc065df803adc2e4e3142fdfdd7309
parentb9f234371bfaf0d9cfa81e02fcea92cac1f9ae13
parentd216b5387fb774d1355df3ace002f7be469bd450
Merge branch 'develop' of https://github.com/Chocobozzz/PeerTube into move-utils-to-shared
20 files changed:
server/tests/api/activitypub/security.ts
server/tests/api/videos/video-blacklist-management.ts
server/tests/api/videos/video-channels.ts
server/tests/api/videos/video-schedule-update.ts
server/tests/api/videos/video-transcoder.ts
shared/utils/requests/check-api-params.ts
shared/utils/search/videos.ts
shared/utils/server/config.ts
shared/utils/server/jobs.ts
shared/utils/server/stats.ts
shared/utils/users/accounts.ts
shared/utils/users/blocklist.ts
shared/utils/users/user-subscriptions.ts
shared/utils/users/users.ts
shared/utils/videos/video-abuses.ts
shared/utils/videos/video-captions.ts
shared/utils/videos/video-channels.ts
shared/utils/videos/video-comments.ts
shared/utils/videos/video-imports.ts
shared/utils/videos/videos.ts