Chocobozzz bb5d90e62f Merge branch 'feature/webtorrent-disabling' into develop		2018-10-17 10:48:56 +02:00
..
controllers	Merge branch 'feature/webtorrent-disabling' into develop	2018-10-17 10:48:56 +02:00
helpers	Merge branch 'feature/webtorrent-disabling' into develop	2018-10-17 10:48:56 +02:00
initializers	Merge branch 'feature/webtorrent-disabling' into develop	2018-10-17 10:48:56 +02:00
lib	Add user/instance block by users in the client	2018-10-16 16:41:36 +02:00
middlewares	Add ability to mute a user/instance by server in server api	2018-10-16 16:41:36 +02:00
models	Merge branch 'feature/webtorrent-disabling' into develop	2018-10-17 10:48:56 +02:00
static/dnt-policy	advertising PeerTube's rather simple DNT policy	2018-08-08 09:22:15 +02:00
tests	Move redundancy in its own travis container	2018-10-16 16:41:36 +02:00
tools	add REPL in server/tools/repl.ts (#1248)	2018-10-14 19:48:08 +02:00