Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	.gradle/9.3.1/executionHistory/executionHistory.bin
#	.gradle/9.3.1/executionHistory/executionHistory.lock
#	.gradle/9.3.1/fileHashes/fileHashes.bin
#	.gradle/9.3.1/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/file-system.probe
#	app/build/intermediates/apk/debug/app-debug.apk
#	app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_
#	app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt
#	build/reports/problems/problems-report.html

...

This commit is contained in:

230405

2026-03-25 12:39:23 +00:00

parent 2f8125d0e0 2f4d8ca214

commit 401f8f33f7

562 changed files with 49585 additions and 16891 deletions

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

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

BIN

.gradle/9.3.1/checksums/checksums.lock

Binary file not shown.

BIN

.gradle/9.3.1/checksums/md5-checksums.bin

Binary file not shown.

BIN

.gradle/9.3.1/checksums/sha1-checksums.bin

Binary file not shown.

BIN

.gradle/9.3.1/fileHashes/resourceHashesCache.bin

Binary file not shown.