callebtc 0cb28a4f3a Merge remote-tracking branch 'origin/main' into opus/redesign-proposal
# Conflicts:
#	app/src/main/java/com/bitchat/android/ui/AboutSheet.kt
#	app/src/main/java/com/bitchat/android/ui/ChatScreen.kt
#	app/src/main/java/com/bitchat/android/ui/LocationChannelsSheet.kt
#	app/src/main/java/com/bitchat/android/ui/debug/DebugSettingsSheet.kt
2026-07-27 04:53:45 +02:00
..
2025-12-14 21:55:41 +07:00