Naomi Seyfer e1aa360b98 Merge branch 'devel' into ddp-pre1 ...

Now don't require _id to be unset on insert anymore.

Some error handling around duplicate _id

Conflicts:
	packages/minimongo/minimongo.js
	packages/mongo-livedata/collection.js
	packages/mongo-livedata/mongo_livedata_tests.js

2013-02-01 16:10:18 -08:00

..

.meteor

Tweak docs.

2012-08-06 16:33:14 -07:00

client

Merge branch 'devel' into ddp-pre1

2013-02-01 16:10:18 -08:00

public

Don't serve app_html for robots.txt. Allow robots on docs site.

2012-06-25 14:00:30 -07:00