4 Commits

Author	SHA1	Message	Date
Anton Georgiev	aa270da0d2	fix footer version, date	2014-10-07 18:05:37 +00:00
Anton Georgiev	319a1247a1	Merge branch 'meteor-new-auth' of github.com:perroned/bigbluebutton into meteor-new-auth ... Conflicts: labs/meteor-client/app/client/globals.coffee labs/meteor-client/app/client/views/chat/chat_bar.coffee labs/meteor-client/app/collections/chat.coffee labs/meteor-client/app/collections/meetings.coffee labs/meteor-client/app/collections/presentations.coffee labs/meteor-client/app/collections/shapes.coffee labs/meteor-client/app/collections/slides.coffee labs/meteor-client/app/collections/users.coffee	2014-10-07 17:45:47 +00:00
Anton Georgiev	c18bc6bf87	missed	2014-10-02 16:18:33 +00:00
Anton Georgiev	3905e45de7	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