Emily Stark 66b73e170e Merge branch 'oauth-encryption' of https://github.com/awwx/meteor into awwx-oauth-encryption ...

Conflicts:
	packages/facebook/facebook_client.js
	packages/github/github_client.js
	packages/google/google_client.js
	packages/meetup/meetup_client.js
	packages/meteor-developer/meteor_developer_client.js
	packages/oauth/pending_credentials.js
	packages/twitter/twitter_client.js
	packages/weibo/weibo_client.js

2014-04-21 11:08:43 -07:00

..

.meteor

Update apps to 0.8.0

2014-03-27 15:46:26 -07:00

client

Merge branch 'oauth-encryption' of https://github.com/awwx/meteor into awwx-oauth-encryption

2014-04-21 11:08:43 -07:00

lib

Update apps to 0.8.0

2014-03-27 15:46:26 -07:00

public

Depends on PR 685 (the appcache package).

2013-02-21 18:41:53 -08:00