Anton Georgiev 7d75843140 Fix a forgotten line left while resolving conflict		2020-07-14 11:19:11 -04:00
..
client	Fix a forgotten line left while resolving conflict	2020-07-14 11:19:11 -04:00
server	Merge pull request #9113 from sualko/feat/html5/settings	2020-05-28 16:21:25 -04:00