bigbluebutton-Github/labs/meteor-client/app/.meteor
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
..
.finished-upgraders (not complete) on meteor 1.0 2014-11-12 16:04:03 -05: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 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 2014-11-18 15:55:29 +00:00
platforms Merge branch 'merge-with-tests' of github.com:lfzawacki/bigbluebutton into merge-with-tests 2014-11-12 16:00:44 -05:00
release (not complete) on meteor 1.0 2014-11-12 16:04:03 -05:00
versions Merge branch 'meteor-client-tests' of github.com:gthacoder/bigbluebutton into meteor-working-on-permissions 2014-11-18 15:55:29 +00:00