Joao Siebel 3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2		2020-06-16 16:40:56 -03:00
..
client	Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2	2020-06-16 16:40:56 -03:00
server	Merge pull request #9113 from sualko/feat/html5/settings	2020-05-28 16:21:25 -04:00