OTR & another.im #23

Merged
Sergei Poljanski merged 65 commits from develop into master 2024-12-09 18:42:00 +00:00
No description provided.
Sergei Poljanski added 65 commits 2024-12-09 18:34:01 +00:00
This reverts commit c145a6b8e5.

# Conflicts:
#	src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
#	src/main/res/values/strings.xml
This reverts commit 635e5675d1.
Reviewed-on: #18
Reviewed-on: #19
Reviewed-on: #20
Reviewed-on: #16
Reviewed-by: kosyak <kosyak@narayana.im>
Reviewed-on: #22
Sergei Poljanski merged commit ecc7cabeda into master 2024-12-09 18:42:00 +00:00
Sergei Poljanski referenced this pull request from a commit 2024-12-09 18:42:01 +00:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: narayana/anotherim#23
No description provided.