Merge branch 'master' into css-refactor

This commit is contained in:
Adam Bradley
2015-12-07 16:12:02 -06:00
11 changed files with 433 additions and 41 deletions

View File

@@ -10,7 +10,8 @@ header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
doc: "<$ doc.name $>"
docType: "<$ doc.docType $>"
<@ if doc.demo @>show_preview_device: true
preview_device_url: "<$ doc.demo $>"<@ endif @>
preview_device_url: "<$ doc.demo $>"
angular_controller: APIDemoCtrl <@ endif @>
---