[xwiki-notifications] [xwiki/xwiki-platform] decf77: XWIKI-22077: Merge conflict when adding content af...

Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: decf77d749f7106776d513cd5ed968dd644f498a https://github.com/xwiki/xwiki-platform/commit/decf77d749f7106776d513cd5ed9… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-10 (Thu, 10 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java Log Message: ----------- XWIKI-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration * Fix javadoc (cherry picked from commit d5b2b218aaff1fdf2526bc07f7720a4fad051ae0) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications