bigbluebutton-Github/labs/meteor-client/app/tests/jasmine
Anton Georgiev 058fa24437 Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/.meteor/versions
2014-11-18 15:55:29 +00:00
..
client/integration/templates Made all the Jasmine suites disabled by default. 2014-11-17 13:40:19 -08:00
server/unit Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 2014-11-18 15:55:29 +00:00