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

upgraded google2fa (0.7->5.0) #3619

Merged
merged 5 commits into from
Jul 13, 2019
Merged

upgraded google2fa (0.7->5.0) #3619

merged 5 commits into from
Jul 13, 2019

Commits on May 24, 2019

  1. upgraded google2fa (0.7->5.0) & composer deps

    @mx2s
    mx2s committed May 24, 2019
    Configuration menu
    Copy the full SHA
    6086a27 View commit details
    Browse the repository at this point in the history

  2. CI fixes

    @mx2s
    mx2s committed May 24, 2019
    Configuration menu
    Copy the full SHA
    bb2ab92 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. replaced bacon/bacon-qr-code with chillerlan/php-qrcode 

    removed imagick dependency

Signed-off-by: Max Kovalenko <[email protected]>
    @mx2s
    mx2s committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    87281f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2019

  1. Merge remote-tracking branch 'forked/2.4' into upgrade-google2fa 

    # Conflicts:
#	composer.lock
    @mx2s
    mx2s committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    2b2337e View commit details
    Browse the repository at this point in the history

  2. updated composer.lock 

    Signed-off-by: Max Kovalenko <[email protected]>
    @mx2s
    mx2s committed Jul 13, 2019
    Configuration menu
    Copy the full SHA
    699bf71 View commit details
    Browse the repository at this point in the history