perroned 26ab092182 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 ... Conflicts: bigbluebutton-client/resources/prod/lib/getScreenId.js		2016-09-21 19:44:42 +00:00
..
api	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
locales	Rewrite leave session modal to the new modal component	2016-09-01 16:29:51 +00:00
startup	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-14 19:30:07 +00:00
ui	Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2	2016-09-21 19:44:42 +00:00
utils	Fixes and improvements on the Dropdown and Modal components	2016-09-06 19:10:18 +00:00