Emily Stark bd7e0d768c Merge branch 'master' into devel ...

Conflicts:
	History.md
	docs/.meteor/release
	packages/mongo-livedata/.npm/package/npm-shrinkwrap.json
	packages/mongo-livedata/package.js

2013-07-19 16:05:29 -07:00

..

.meteor

Merge branch 'master' into devel

2013-07-19 16:05:29 -07:00

client

Add a note about how isServer doesn't strip code from the client.

2013-07-17 19:57:40 -07:00

public

Depends on PR 685 (the appcache package).

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