perroned 1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/resources/config.xml.template		2017-02-02 15:27:08 +00:00
..
stylesheets	HTML5 - fixes merge conflicts bw master and this branch	2016-12-20 09:18:24 -08:00
main.css	Fix [aria-hidden] elements being hidden	2016-12-07 09:49:15 -02:00
main.html	Set a viewport	2016-07-11 12:10:30 -07:00
main.jsx	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2017-02-02 15:27:08 +00:00