Skip to content

Conversation

@SUPERCILEX
Copy link
Collaborator

@samtstern I tried to warn you and @amandle in amandle#1 (comment), but I forgot to update #583. Anyway, this PR adds back the changes in #591.

Aaron Mandle and others added 25 commits February 8, 2017 17:52
…enticate

# Conflicts:
#	auth/src/main/java/com/firebase/ui/auth/AuthUI.java
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
# Conflicts:
#	auth/src/main/java/com/firebase/ui/auth/AuthUI.java
…auth-pr

# Conflicts:
#	auth/src/main/java/com/firebase/ui/auth/AuthUI.java
#	auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java
Signed-off-by: Alex Saveau <saveau.alexandre@gmail.com>
@samtstern
Copy link
Contributor

@SUPERCILEX oops, thanks!

@samtstern samtstern merged commit 7c2f436 into firebase:version-2.0.0-dev Mar 13, 2017
@SUPERCILEX SUPERCILEX deleted the fix-reauth-pr branch March 13, 2017 23:42
@SUPERCILEX
Copy link
Collaborator Author

@samtstern Awesome, thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants