prlanzarin 3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection		2017-12-21 17:37:07 +00:00
..
config	Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection	2017-12-21 17:37:07 +00:00
locales	Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection	2017-12-21 17:37:07 +00:00