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

Conflicts:
	docs/client/api.html
	docs/client/data.js
	docs/client/names.json
	meteor
	packages/autoupdate/package.js
	packages/base64/.gitignore
	packages/constraint-solver/package.js
	packages/device-orientation/.gitignore
	packages/less/package.js
	packages/meteor-tool/package.js
	packages/meteor/package.js
	packages/package-version-parser/package.js
	packages/webapp/webapp_server.js
	scripts/admin/meteor-release-experimental.json
	tools/commands.js
	tools/help.txt
	tools/package-version-parser.js
	tools/run-all.js
	tools/tests/apps/build-errors/packages/with-colon-plugin/.gitignore

2014-09-15 14:48:57 -07:00

..

packages

Typo

2014-09-10 15:42:32 -07:00

.gitattributes

Add docs for EJSON interface, attempt to remove data.js from diffs

2014-09-05 14:37:28 -07:00

api-box.html

No more old docs!

2014-09-05 19:04:54 -07:00

api-box.js

Improve docs

2014-09-09 11:38:41 -07:00

api.html

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

commandline.html

Merge branch 'release-0.9.1' into cordova-hcp

2014-08-28 21:13:59 -07:00

concepts.html

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

data.js

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

docs.css

Fix some package api docs

2014-09-05 09:56:22 -07:00

docs.html

UI.View docs

2014-08-14 20:13:48 -07:00

docs.js

Merge branch 'master' into devel

2014-09-15 14:48:57 -07:00

ga.html

Mixpanel in docs tweaks.

2013-04-01 14:29:16 -07:00

introduction.html

Rename Deps to Tracker in the docs

2014-08-27 20:20:53 -07:00

link-redirect.js

Merge branch 'check' into devel

2014-09-05 18:40:08 -07:00

names.json

Talk about tarball URLs

2014-09-10 15:48:20 -07:00

nameToId.js

Improve docs

2014-09-09 11:38:41 -07:00

packages.html

Add documentation about fastclick

2014-09-10 15:42:07 -07:00

splash.less

make docs work on ios, suppress nav on phone.

2012-03-28 17:57:29 -07:00