perroned a95ed82293 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton ... Conflicts: bigbluebutton-html5/imports/api/verto/index.js bigbluebutton-html5/imports/ui/components/deskshare/service.js		2016-06-15 20:07:42 +00:00
..
stylesheets	Merge branch 'html5-new-userlist' into html-userlist	2016-05-31 08:37:14 -03:00
main.css	Add base components and style for Chat	2016-06-01 13:33:19 -03:00
main.html	Switch from ion-router to react-router	2016-04-28 15:57:14 -04:00
main.jsx	Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton	2016-06-15 20:07:42 +00:00