Merge branch 'master' into live

This commit is contained in:
Brian Lich 2016-11-17 10:42:51 -08:00
commit ee6cc95e7e

View File

@ -31,7 +31,7 @@
"build_output_subfolder": "devices/hololens", "build_output_subfolder": "devices/hololens",
"locale": "en-us", "locale": "en-us",
"version": 0, "version": 0,
"open_to_public_contributors": false, "open_to_public_contributors": true,
"type_mapping": { "type_mapping": {
"Conceptual": "Content", "Conceptual": "Content",
"ManagedReference": "Content", "ManagedReference": "Content",