Skip to content
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

chore: Merge master into develop #109

Merged
merged 7 commits into from
Jun 21, 2023
Merged

chore: Merge master into develop #109

merged 7 commits into from
Jun 21, 2023

Conversation

tikhop
Copy link
Owner

@tikhop tikhop commented Jun 21, 2023

Issue being fixed or feature implemented

Merge last changes from master to develop branch

What was done?

N/A

How Has This Been Tested?

N/A

Breaking Changes

N/A

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation

tikhop and others added 7 commits December 20, 2021 14:15
* develop:
  Make sure to use a consistent style for braces (Allman, not K&R)
  Allow isEligibleForIntroductoryOffer() method to be called from Objective-C by exposing it through the InAppReceipt_Objc wrapper class
Use kIOMainPortDefault instead of kIOMasterPortDefault when possible.
@tikhop tikhop merged commit 4d5fd80 into develop Jun 21, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants