Merge branch '2.0' into windows-mode

# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2016-02-29 19:02:55 -05:00
69 changed files with 2677 additions and 1197 deletions

View File

@ -18,7 +18,8 @@ module.exports = function jekyll(renderDocsProcessor) {
});
docs.forEach(function(doc, i) {
docs[i].URL = doc.outputPath.replace('docs/v2//','docs/v2/')
.replace('/index.md','');
.replace('/index.md','')
.replace('//home/ubuntu/ionic/ionic', '/');
});
docs.push({