Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xwiki-platform
- Activity
- Members
- Terraform modules

Snippets Groups Projects

e00e159d

Commit e00e159d authored 1 year ago by pjeanjean Committed by Michael Hamann 1 year ago

Downloads
- Patches
- Plain Diff

XWIKI-21626: Improve escaping during conflict resolution

(cherry picked from commit 821d43ec)

parent 39141b90

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

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 6 additions, 6 deletions

...er/src/test/it/org/xwiki/flamingo/test/docker/EditIT.java
xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm 10 additions, 1 deletion

...web-templates/src/main/resources/templates/diff_macros.vm

with 16 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment