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

..

.npm/package

shrinkwrap update from 314c8a1

2014-05-07 17:31:29 -07:00

.gitignore

Factor webapp-specific stuff (and keepalive) out of boot.js into webapp package.

2013-05-13 11:58:58 -07:00

package.js

Bump package versions for 0.9.2

2014-09-15 11:36:57 -07:00

webapp_client.js

Fix eternal reload on pages with no stylesheets.

2014-02-02 15:31:58 -08:00

webapp_server.js

Merge branch 'master' into devel

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

webapp_tests.js

Another fix for webapp test and behavior.

2014-09-05 15:31:06 -07:00