Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: e00e159d3737397eebd1f6ff925c1f5cb7cdec34 https://github.com/xwiki/xwiki-platform/commit/e00e159d3737397eebd1f6ff925c1... Author: pjeanjean <[email protected]> Date: 2024-03-21 (Thu, 21 Mar 2024) Changed paths: M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/EditIT.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm Log Message: ----------- XWIKI-21626: Improve escaping during conflict resolution (cherry picked from commit 821d43ec45e67d45a6735a0717b9b77fffc1cd9f) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications