 CC
|
3ac6976a54
|
Merge branch 'main' into wifi-aware-refactor-mesh-core
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/bitchat/android/BitchatApplication.kt
# app/src/main/java/com/bitchat/android/MainActivity.kt
# app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionTracker.kt
# app/src/main/java/com/bitchat/android/mesh/BluetoothMeshService.kt
# app/src/main/java/com/bitchat/android/noise/NoiseEncryptionService.kt
# app/src/main/java/com/bitchat/android/onboarding/PermissionManager.kt
# app/src/main/java/com/bitchat/android/ui/SidebarComponents.kt
|
2026-06-08 22:56:40 +02:00 |
|