Maxim Khlobystov d03defeb33 (merging from Maxim) Implemented switching slides. ... Conflicts: bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-app-presentation.xml labs/meteor-client/client/views/whiteboard/whiteboard.coffee labs/meteor-client/client/views/whiteboard/whiteboard.html labs/meteor-client/server/redispubsub.coffee		2015-05-06 19:55:29 +00:00
..
main	(merging from Maxim) Implemented switching slides.	2015-05-06 19:55:29 +00:00
test	Revert "Revert "Bbb lock settings fix""	2015-03-04 16:47:35 -05:00