Merge remote-tracking branch 'origin/master'

haganbmj · haganbmj · commit c080ca79612e · 2020-09-23T21:26:55.000-04:00
diff --git a/.travis/build-types.ts b/.travis/build-types.ts
@@ -433,6 +433,7 @@ function resolveType(inType: string): AnyType {
         type: 'ObsWebSocket.OBSStats',
         optional: isOptional
       };
+    case 'string | object':
     case 'object':
       return {
         type: 'object',
