Merge branch 'live' into master

This commit is contained in:
Brian Lich 2017-04-24 10:33:54 -07:00 committed by GitHub
commit b476df47fe

View File

@ -39,8 +39,10 @@
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
@ -79,8 +81,10 @@
"ManagedReference": "Content", "ManagedReference": "Content",
"RestApi": "Content" "RestApi": "Content"
}, },
"build_entry_point": "docs", "build_entry_point": "docs",
"template_folder": "_themes", "template_folder": "_themes",
"version": 0 "version": 0
}, },
{ {
@ -300,3 +304,4 @@
], ],
"need_generate_pdf_url_template": false "need_generate_pdf_url_template": false
} }