Anton Georgiev 5e99ec98c1 Merge branch 'master' into lock-settings ... Conflicts: bigbluebutton-html5/app/client/views/chat/chat_bar.html bigbluebutton-html5/app/server/user_permissions.coffee		2015-04-22 14:50:30 +00:00
..
lib	Update method we check call status	2015-04-16 08:56:56 -07:00
stylesheets	Merge branch 'master' into lock-settings	2015-04-22 14:50:30 +00:00
views	Merge branch 'master' into lock-settings	2015-04-22 14:50:30 +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	renaming the autoJoin parameter	2015-04-16 15:39:06 +00:00
main.html	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00