-
Notifications
You must be signed in to change notification settings - Fork 365
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge from master to beta #1893
Conversation
bcfdbdd
to
8d66ab6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@@ -394,7 +394,7 @@ protected static String normalizeClientId(String clientId) { | |||
} | |||
|
|||
protected static String normalizeStripeVersion(String stripeVersion) { | |||
// null stripeVersions are considered "valid" and use Stripe.stripeVersion | |||
// null stripeVersions are considered "valid" and use Stripe.apiVersion |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't it be Stripe.stripeVersion
?
public static volatile String stripeVersion = API_VERSION; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right. I assumed what was in master to be the source of truth - didnt check the actual property name
There have been more changes in the master branch since the last time we merged from it to beta. Doing on last merge from master before this week's beta releases