Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable26] Fix diverging user status #9419

Merged
merged 3 commits into from May 2, 2023
Merged

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented May 2, 2023

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #9411

Signed-off-by: Joas Schilling <coding@schilljs.com>
@backportbot-nextcloud backportbot-nextcloud bot added feature: api 🛠️ OCS API for conversations, chats and participants feature: conversations 👥 feature: frontend 🖌️ "Web UI" client labels May 2, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the 💘 Next Patch (26) milestone May 2, 2023
@Antreesy
Copy link
Contributor

Antreesy commented May 2, 2023

Import {emit} is lost

…dates

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen self-assigned this May 2, 2023
@nickvergessen nickvergessen marked this pull request as ready for review May 2, 2023 11:18
@nickvergessen nickvergessen merged commit 737783b into stable26 May 2, 2023
31 checks passed
@nickvergessen nickvergessen deleted the backport/9411/stable26 branch May 2, 2023 20:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature: api 🛠️ OCS API for conversations, chats and participants feature: conversations 👥 feature: frontend 🖌️ "Web UI" client
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants