Merge branch 'feature/webtorrent-disabling' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 17 Oct 2018 08:48:56 +0000 (10:48 +0200)
commitbb5d90e62f631af3c899fbe586485e64938a5927
tree8dc28c7027a52bed76bcc7e117da290ff7a58b6b
parentbcf21a376f1e26cb3e74236e4cc41909310d4c32
parenta73115f31ae891cb47759f075b1d2cead40817a4
Merge branch 'feature/webtorrent-disabling' into develop
server/controllers/api/users/me.ts
server/initializers/constants.ts