Merge branch 'feature/webtorrent-disabling' into develop

author Chocobozzz <me@florianbigard.com>

Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)

committer Chocobozzz <me@florianbigard.com>

Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
author Chocobozzz <me@florianbigard.com>
Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
committer Chocobozzz <me@florianbigard.com>
Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
diff --cc server/controllers/api/users/me.ts
Simple merge
diff --cc server/initializers/constants.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
committer	Chocobozzz <me@florianbigard.com>
	Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
		1	2
server/controllers/api/users/me.ts	patch \|	diff1 \|	diff2 \|	blob \| history
server/initializers/constants.ts	patch \|	diff1 \|	diff2 \|	blob \| history