perroned 01b7fc9111 Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client ... Conflicts: labs/meteor-client/client/views/users/user_list.coffee labs/meteor-client/server/insert-startup-data.js		2014-06-20 07:32:12 -07:00
..
chat	Use data from session now	2014-06-19 10:52:08 -07:00
users	Merge branch 'meteor-rebuild-server' of https://github.com/antobinary/bigbluebutton into prototype-metor-client	2014-06-20 07:32:12 -07:00
layout.html	Added iron router	2014-06-13 09:22:30 -07:00