Klaus 63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options		2017-08-02 11:36:16 -03:00
..
config	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options	2017-08-02 11:36:16 -03:00
locales	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options	2017-08-02 11:36:16 -03:00