Skip to content
This repository was archived by the owner on Mar 10, 2022. It is now read-only.

Conversation

@mariusc
Copy link
Contributor

@mariusc mariusc commented Jan 20, 2017

I had to use the the ours merge strategy to merge master in swift-3.0, so I can make this PR and merge swift-3.0 into master. The tests passed locally, so I hope everything is ok 😃

kasperwelner and others added 30 commits September 17, 2016 14:36
…e will be shown with the new color. When the spinner finishes loading the colors will only be restored if they haven't been changed since showing the spinner. Demo Project added to Repo.
Fixes to how the button handles colors. Demo project added.
Merge pull request #17 from nodes-ios/buttonTitleColorBug
@mariusc mariusc requested a review from dominik-hadl January 20, 2017 08:55
@mariusc mariusc merged commit 8002775 into master Jan 20, 2017
@mariusc mariusc deleted the swift-3.0 branch January 20, 2017 14:38
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.

5 participants