Merge branch 'live'

This commit is contained in:
Brian Lich 2016-05-18 11:16:07 -07:00
commit ad59ed84fc

View File

@ -52,7 +52,7 @@
"Conceptual": "Content" "Conceptual": "Content"
} }
}, },
{ {
"docset_name": "mdop", "docset_name": "mdop",
"build_output_subfolder": "mdop", "build_output_subfolder": "mdop",
"locale": "en-us", "locale": "en-us",