Skip to content

Move two_factor_authentication gem to upstream version#172

Merged
monfresh merged 1 commit intomasterfrom
upstream_2fa_gem
Jun 16, 2016
Merged

Move two_factor_authentication gem to upstream version#172
monfresh merged 1 commit intomasterfrom
upstream_2fa_gem

Conversation

@sbc100
Copy link
Contributor

@sbc100 sbc100 commented Jun 15, 2016

Our changes are now upstream so we no longer need to
point at our own branch.

Our changes are now upstream so we no longer need to
point at our own branch.
@monfresh
Copy link
Contributor

I would hold off on merging this until we come to an agreement about the latest changes that involve confirming the TOTP setup.

@monfresh
Copy link
Contributor

Sam and I have discussed the changes and we are OK with merging this.

@monfresh monfresh merged commit ba26a14 into master Jun 16, 2016
@monfresh monfresh deleted the upstream_2fa_gem branch June 16, 2016 15:44
@monfresh monfresh added this to the Sprint 8 milestone Jun 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants