Merge pull request #8921 from ysc3839/tr-web-control
authorRosen Penev <rosenp@gmail.com>
Mon, 6 May 2019 18:38:56 +0000 (11:38 -0700)
committerGitHub <noreply@github.com>
Mon, 6 May 2019 18:38:56 +0000 (11:38 -0700)
commit0a3772b48e9871dab10ea566cd26854059f83b18
treeb0b6b9a681dccfff2bdd1d8d76da625fe87b9130
parentf31949d649edcdf91b81c9c2c84d65c9851dbcb8
parent6b49b9c56631e71ac2e1d7715113c17fed90332d
Merge pull request #8921 from ysc3839/tr-web-control

Revert "transmission-web: set conflicts with transmission-web-control"