Feature/macos and tv os #155
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I will fix the conflicts once after we discussed here since it is a quite complex one. |
brototyp
force-pushed
the
feature/macos-and-tv-os
branch
2 times, most recently
from
c120895 to
23f893e
Compare
# Conflicts: # Example/ios/iOS Example/OptOutViewController.m # Example/ios/ios.xcodeproj/project.pbxproj # PiwikTracker.podspec # Podfile.lock
brototyp
force-pushed
the
feature/macos-and-tv-os
branch
from
23f893e to
0c4ef06
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #134