bigbluebutton-Github/labs/meteor-client/app/.meteor
Anton Georgiev 2b819c2499 Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005
Conflicts:
	labs/meteor-client/app/.meteor/packages
	labs/meteor-client/app/smart.json
	labs/meteor-client/app/smart.lock
2014-11-12 13:14:21 -05:00
..
.finished-upgraders update Meteor from 0.8.x to 0.9.4 2014-10-15 22:24:30 +00:00
.gitignore 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
.id 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
cordova-plugins update Meteor from 0.8.x to 0.9.4 2014-10-15 22:24:30 +00:00
packages Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005 2014-11-12 13:14:21 -05:00
release update Meteor from 0.8.x to 0.9.4 2014-10-15 22:24:30 +00:00
versions Merge branch 'testing-version-005' of github.com:lfzawacki/bigbluebutton into testing-version-005 2014-11-12 13:14:21 -05:00