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

Browse Source

# 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

...

This commit is contained in:

beasonxu 2024-08-31 10:02:17 +08:00

parent 6375195763 166778ea53

commit ebc60d9357

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available