Skip to content
This repository has been archived by the owner on Jul 31, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into release/1.0.2
Browse files Browse the repository at this point in the history 
Merge master branch to resolve conflicts in the podspec file.
  • Loading branch information
Mike Westendorf committed Aug 22, 2017
2 parents 2e2ac93 + 2dc4b05 commit 0b3924f
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 0b3924f

Please sign in to comment.