BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b9462e4f2a
bigbluebutton-Github/labs/meteor-client/app/collections
History
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
..
collections.coffee 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