Sashko Stubailo cffd5cc78d Merge branch 'release-1.0.4' into windows-preview-0.2.1 ...

Conflicts:
	History.md
	packages/accounts-password/password_server.js
	packages/constraint-solver/package.js
	packages/meteor-tool/package.js
	packages/package-version-parser/package-version-parser.js
	packages/package-version-parser/package.js
	tools/selftest.js

2015-03-12 16:56:11 -07:00

..

api

Fix the example to use self instead of this

2015-03-11 16:30:57 -07:00

packages

showdown package is moved to markdown package.

2014-12-04 12:11:47 -08:00

api.md

Make a lot of progress towards merging basic and full docs

2014-10-22 23:49:25 -07:00

commandline.html

Added missing meteor debug content.

2015-03-10 15:26:43 -07:00

concepts.html

minor rewording of a docs PR

2015-02-10 15:01:04 -08:00

docs.html

Add command line section back in

2014-10-28 14:59:55 -07:00

docs.js

Don't force external links to open in a new tab

2014-12-14 01:04:47 -08:00

introduction.html

Remove "work in progress" text

2015-03-04 21:05:57 -08:00

nameToId.js

Update documentation about Template#onCreated/onRendered/onDestroyed

2015-01-16 11:29:22 -08:00

packages.html

showdown package is moved to markdown package.

2014-12-04 12:11:47 -08:00

tableOfContents.html

Add ability to define custom link for ToC, and add link for spiderable

2014-12-04 12:17:13 -08:00

tableOfContents.js

Added missing meteor debug content.

2015-03-10 15:26:43 -07:00

toc.less

Make a lot of progress towards merging basic and full docs

2014-10-22 23:49:25 -07:00