Merge branch 'master' into CB-7179

This commit is contained in:
Dave Alden
2018-10-09 11:15:23 +01:00
6 changed files with 134 additions and 20 deletions
+1
View File
@@ -45,6 +45,7 @@
@property (nonatomic, assign) BOOL suppressesincrementalrendering;
@property (nonatomic, assign) BOOL hidden;
@property (nonatomic, assign) BOOL disallowoverscroll;
@property (nonatomic, assign) BOOL beforeload;
+ (CDVInAppBrowserOptions*)parseOptions:(NSString*)options;