1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00

Merge branch 'move-utils-to-shared' of https://github.com/buoyantair/PeerTube into buoyantair-move-utils-to-shared

This commit is contained in:
Chocobozzz 2018-12-07 16:09:57 +01:00
commit 2a8c5d0af1
No known key found for this signature in database
GPG key ID: 583A612D890159BE
114 changed files with 867 additions and 237 deletions

View file

@ -32,10 +32,10 @@ import {
updateUser,
uploadVideo,
userLogin
} from '../../utils/index'
import { follow } from '../../utils/server/follows'
import { setAccessTokensToServers } from '../../utils/users/login'
import { getMyVideos } from '../../utils/videos/videos'
} from '../../../../shared/utils/index'
import { follow } from '../../../../shared/utils/server/follows'
import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
import { getMyVideos } from '../../../../shared/utils/videos/videos'
const expect = chai.expect