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

Added activity animation as appearance parameter and added button for wait example #343

Merged
merged 3 commits into from
Oct 16, 2017
Merged

Added activity animation as appearance parameter and added button for wait example #343

merged 3 commits into from
Oct 16, 2017

Conversation

paulocoutinhox
Copy link
Contributor

No description provided.

@vikmeup
Copy link
Owner

vikmeup commented Oct 4, 2017

@PRSolucoes can you take a look at this PR? there is merge conflicts

@paulocoutinhox
Copy link
Contributor Author

Ok, i will check

@paulocoutinhox
Copy link
Contributor Author

Dont have conflicts. See:

image

@paulocoutinhox
Copy link
Contributor Author

I made the merge with your master. Can you make the merge?

@vikmeup vikmeup merged commit 3fb59cf into vikmeup:master Oct 16, 2017
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@paulocoutinhox @vikmeup