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

Qr scan #307

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Qr scan #307

wants to merge 3 commits into from
+72 −2

Commits on Aug 30, 2024

  1. add qr scanner

    @beasonxu
    beasonxu committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    166778e View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. add qr scanner function

    @beasonxu
    beasonxu committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    6375195 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/qr_scan' into qr_scan 

    # Conflicts:
#	app/build.gradle.kts
#	app/src/main/java/com/github/kr328/clash/NewProfileActivity.kt
#	design/src/main/java/com/github/kr328/clash/design/model/ProfileProvider.kt
    @beasonxu
    beasonxu committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    ebc60d9 View commit details
    Browse the repository at this point in the history