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
..
nextcloud/talk	Merge remote-tracking branch 'origin/feature/edit_messages' into feature/edit_messages	2024-02-05 23:01:25 +01:00