Avital Oliver 2ff683768d Merge branch 'master' into devel ...

Conflicts:
	History.md
	docs/client/data.js
	docs/client/docs.js
	packages/meteor-tool/package.js
	packages/package-version-parser/package.js
	scripts/admin/meteor-release-experimental.json
	tools/package-client.js

2014-09-30 23:37:10 -07:00

..

admin

Merge branch 'master' into devel

2014-09-30 23:37:10 -07:00

dev-bundle-package.json

Put 'ip' into dev_bundle

2014-09-24 12:02:34 -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-android-bundle.sh

Prompt user with licensing file before meteor add-platform

2014-09-11 14:52:11 -07:00

generate-dev-bundle.sh

add sqllite to 0.9.4 branch

2014-09-30 14:55:42 -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