Skip to content
This repository has been archived by the owner on Aug 14, 2019. It is now read-only.

Combined PullRequest. #35

Merged
merged 23 commits into from
Jul 25, 2013
Merged

Combined PullRequest. #35

merged 23 commits into from
Jul 25, 2013

Conversation

zhigang1992
Copy link
Contributor

Combined PullRequest of
#34
#33
#32
#31

So that you don't have to worry about the merge conflict.

I also took the liberty of updating it CocoaPods. (I don't know how to use it other wise)
Let me know if you want to revert that change.

@jessesquires
Copy link
Owner

Damn @zhigang1992 you've been busy! Most of this looks pretty good, or at least a good start. I'm going to go ahead and accept this, do some refactoring, and update all of the documentation. Thanks for your contributions! I really appreciate it!

jessesquires added a commit that referenced this pull request Jul 25, 2013
@jessesquires jessesquires merged commit 6bcfbaf into jessesquires:master Jul 25, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants