David Glasser 996d347139 Merge branch 'devel' into packaging ...

Conflicts:
	docs/client/api.html
	docs/client/concepts.html
	docs/client/introduction.html
	meteor
	packages/html-tools/package.js
	packages/spacebars-common/package.js
	packages/webapp/webapp_server.js
	tools/bundler.js

2014-07-21 16:18:25 -07:00

..

admin

Merge branch 'devel' into packaging

2014-07-21 16:18:25 -07:00

dev-bundle-package.json

Use a package.json file for deps of boot.js

2014-07-01 14:57:42 -07:00

doctool.js

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

doctool.md

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

doctool.md.md

Document Blaze.Var, check in doctool.js

2014-04-29 11:05:03 -07:00

generate-dev-bundle.sh

Add BrowserStackLocal binary to dev_bundle

2014-07-03 14:18:55 -07:00

node.sh

use meteor --get-ready instead of --version in places where we're trying to make

2013-03-29 11:52:33 -07:00