Maxim Khlobystov e1cad84bd5 Merge branch 'summit-desktop-settings' of https://github.com/perroned/bigbluebutton into meteor-client-new-ui ... Conflicts: bigbluebutton-html5/app/client/main.coffee		2015-05-07 19:04:51 -04:00
..
chat	merge	2015-05-06 23:15:08 -07:00
modals	Update BBB settings information	2015-05-06 23:26:40 -07:00
users	merge	2015-05-06 23:15:08 -07:00
whiteboard	Hide presenter functionality	2015-05-06 23:26:55 -07:00
layout.html	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
sharedTemplates.html	Made the buttons template uniform to be able to use both Ionicons and Foundation icons.	2015-05-07 18:48:14 -04:00