Merge remote-tracking branch 'origin/main'

# 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:
2026-03-25 12:39:23 +00:00
562 changed files with 49585 additions and 16891 deletions

Some files were not shown because too many files have changed in this diff Show More