David Glasser c5e5305a3b Merge branch 'devel' into packaging ...

Conflicts:
	tools/bundler.js
	tools/packages.js

2014-06-11 12:02:57 -07:00

..

.gitignore

More fixes, from the merge of devel into linker.

2013-05-28 15:52:50 -07:00

google_client.js

Merge remote-tracking branch 'origin/devel' into awwx-oauth-encryption

2014-04-22 11:31:31 -07:00

google_configure.html

Merge branch 'devel' into shark

2014-03-06 16:21:33 -08:00

google_configure.js

Extract google package from accounts-google

2013-05-17 18:00:35 -07:00

google_server.js

Add credentialSecret to Google.retrieveCredential

2014-05-16 11:09:37 -07:00

google-versions.json

new version files from teh new solver? Also, package.js correct with tests

2014-05-09 17:36:25 -07:00

package.js

Revert "Meteor.loginWith<External> now waits for config"

2014-04-21 13:39:36 -07:00