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.

Sign up for GitHub

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

Jump to bottom

Add Carthage Support #12

Merged
merged 8 commits into from
Dec 5, 2016
Merged

Add Carthage Support #12

merged 8 commits into from
Dec 5, 2016

Conversation

stupergenius
Copy link
Contributor

As requested in #11.

@dalu93 dalu93 changed the base branch from master to develop December 4, 2016 09:03
@dalu93
Copy link
Owner

dalu93 commented Dec 4, 2016

@stupergenius I changed the end branch to develop (was master) before. Can you please solve the merge conflict?

@dalu93 dalu93 added this to the 1.1.1 milestone Dec 4, 2016
@stupergenius
Copy link
Contributor Author

@dalu93 Changes from develop merged in.

@dalu93 dalu93 merged commit 6d40ace into dalu93:develop Dec 5, 2016
@dalu93
Copy link
Owner

dalu93 commented Dec 5, 2016

Thanks @stupergenius

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
1.2
Development

Successfully merging this pull request may close these issues.
2 participants
@stupergenius @dalu93