bigbluebutton-Github/labs/meteor-client/.gitignore
Anton Georgiev 46b8f8a923 Merge branch 'prototype-metor-client' of github.com:perroned/bigbluebutton into meteor-rebuild-server
Conflicts:
	labs/meteor-client/smart.json
	labs/meteor-client/smart.lock
2014-06-12 20:22:42 +00:00

2 lines
9 B
Plaintext