Adam Bradley 53a426f802 Merge branch 'master' of https://github.com/driftyco/ionic ...

Conflicts:
	docs/templates/lib/yaml.template.html

2014-03-13 13:56:22 -05:00

..

api

docs: fix api.template

2014-03-13 07:32:34 -06:00

lib

rename docs_0.9.0 layout to docs_api, active variable no longer needed

2014-03-13 13:54:02 -05:00

index.template.html

docs: allow multiple versions

2014-03-12 15:55:50 -06:00

pages-data.template.html

docs: make sure Javascript links to latest stable by default

2014-03-13 09:18:47 -06:00