Merge remote-tracking branch 'origin/master' into tyriar/15583

This commit is contained in:
Daniel Imms
2017-01-10 19:26:15 -08:00
64 changed files with 866 additions and 573 deletions

View File

@@ -96,7 +96,7 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ
if (extension.enableProposedApi) {
if (!initData.environment.enableProposedApi) {
if (!initData.environment.enableProposedApi && !extension.isBuiltin) {
extension.enableProposedApi = false;
console.warn('PROPOSED API is only available when developing an extension');