Skip to content

Improve disappearing message settings - #6591

Merged
crossle merged 14 commits into
masterfrom
feat/improve-disappearing-messages
Oct 29, 2026
Merged

crossle merged 14 commits into
masterfrom
feat/improve-disappearing-messages

Conversation

@SeniorZhai

Copy link
Copy Markdown
Member

No description provided.

@SeniorZhai
SeniorZhai marked this pull request as ready for review August 27, 2026 06:12
@SeniorZhai

Copy link
Copy Markdown
Member Author

@copilot please fix the merge conflicts in this pull request.

…earing-messages

# Conflicts:
#	app/src/main/java/one/mixin/android/ui/group/NewGroupFragment.kt
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-in/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-ko/strings.xml
#	app/src/main/res/values-ms/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values/strings.xml

Co-authored-by: SeniorZhai <5416585+SeniorZhai@users.noreply.github.com>

Copilot AI commented Oct 24, 2026

Copy link
Copy Markdown
Contributor

@copilot please fix the merge conflicts in this pull request.

Merged master and resolved the conflicts in commit 146b52a.

@crossle
crossle merged commit 2c717eb into master Oct 29, 2026
1 check passed
@crossle
crossle deleted the feat/improve-disappearing-messages branch October 29, 2026 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants