Merge branch 'develop' into feature/sms_action
This commit is contained in:
commit
910fbe7e32
@ -71,7 +71,7 @@
|
||||
if (alternateBase) {
|
||||
self.alternateBaseURL = [NSURL URLWithString:alternateBase];
|
||||
}
|
||||
NSString *url = [actionMap string:@"URL"];
|
||||
NSString *url = [actionMap string:@"requestURL"];
|
||||
if (url) {
|
||||
self.URL = [NSURL URLWithString:url];
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
public var pageType: String
|
||||
public var baseURL: String?
|
||||
public var appContext: String?
|
||||
public var URL: String?
|
||||
public var requestURL: String?
|
||||
public var extraParameters: JSONValueDictionary?
|
||||
public var analyticsData: JSONValueDictionary?
|
||||
public var presentationStyle: String?
|
||||
|
||||
Loading…
Reference in New Issue
Block a user