sowjanyakch 6a0f23c39b Merge remote-tracking branch 'origin/feature/edit_messages' into feature/edit_messages ... # Conflicts: # app/src/main/java/com/nextcloud/talk/api/NcApi.java # app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt # app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt # app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt # app/src/main/res/drawable/ic_check_24.xml # app/src/main/res/values/strings.xml		2024-02-05 23:01:25 +01:00
..
schemas/com.nextcloud.talk.data.source.local.TalkDatabase	add diagnose screen and permission warnings in settings	2024-01-12 09:54:28 +01:00
src	Merge remote-tracking branch 'origin/feature/edit_messages' into feature/edit_messages	2024-02-05 23:01:25 +01:00
build.gradle	move to new artifact id of dav4jvm lib	2024-02-02 13:17:01 +01:00
lint.xml	fix patch regex for ca lang	2024-01-30 14:26:08 +01:00
proguard-rules.pro	Initial import	2017-10-23 12:40:38 +02:00