perroned ce41c6798d Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth ... Conflicts: labs/meteor-client/app/client/views/whiteboard/slide.coffee labs/meteor-client/app/server/collection_methods/users.coffee		2014-10-16 06:15:13 -07:00
..
compatibility	Changed webrtc call to use nginx websocket.	2014-10-09 09:35:39 -07:00
lib	moving the meteor files into an app folder so that grunt can reside in the root without breaking meteor	2014-10-02 16:16:34 +00:00
stylesheets	Removing presenter functionality from this viewer branch.	2014-10-14 08:51:08 -07:00
views	Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth	2014-10-16 06:15:13 -07:00
whiteboard_models	Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth	2014-10-16 06:15:13 -07:00
globals.coffee	Merge remote-tracking branch 'anton/meteor-new-auth' into meteor-new-auth	2014-10-16 06:15:13 -07:00
main.coffee	joining and leaving audio is working fine now	2014-10-14 21:59:49 +00:00
main.html	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth	2014-10-07 19:52:51 +00:00