Richard Alam 85d3bca1d1 Merge pull request #625 from antobinary/lock-settings ... html5client:Lock settings implementation		2015-04-27 10:47:24 -04:00
..
lib	revert server side permission change	2015-04-23 15:46:52 +00:00
stylesheets	Merge branch 'master' into lock-settings	2015-04-22 14:50:30 +00:00
views	check if null to prevent error	2015-04-27 14:42:03 +00:00
whiteboard_models	Added some comments.	2015-04-13 17:26:01 -07:00
globals.coffee	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00
main.coffee	Merge pull request #625 from antobinary/lock-settings	2015-04-27 10:47:24 -04:00
main.html	Fixed the bug with missing audio buttons on the sliding menu and made the menu work correctly with audio.	2015-04-24 11:51:13 -07:00