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
..
chat.coffee	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
meetings.coffee	lock settings - handle new_permission_settings, user_locked_message	2015-03-30 17:49:30 +00:00
presentations.coffee	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
shapes.coffee	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
slides.coffee	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
users.coffee	Merge branch 'master' into lock-settings	2015-04-22 14:50:30 +00:00