Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
element-x-ada/app
History
Exact
Cobb 0ef6b69a79 Merge branch 'main' into wallet 
# Conflicts:
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt
#	features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
#	libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/mentions/ResolvedSuggestion.kt
2026-04-16 22:05:16 -07:00
..
signature Setup nighlty build + GitHub action 2022-11-23 15:11:27 +01:00
src Sync Strings from Localazy 2026-04-13 00:48:40 +00:00
build.gradle.kts fix(wallet): resolve DI scope mismatch, WalletState constructors, packaging conflict 2026-03-27 21:56:01 -07:00
common-proguard-rules.pro fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v26.03.19 (#6411) 2026-03-20 16:20:37 +01:00
default-proguard-rules.pro Remove obfuscation in proguard (#6067) 2026-01-23 16:39:11 +01:00