Commit f30b833d authored by Vincent Massol's avatar Vincent Massol
Browse files

Merge branch 'syntax-asciidoc' of github.com:xwiki/xwiki-rendering into syntax-asciidoc

Conflicts:
	xwiki-rendering-syntaxes/xwiki-rendering-syntax-asciidoc/pom.xml
	xwiki-rendering-syntaxes/xwiki-rendering-syntax-asciidoc/src/main/java/org/xwiki/rendering/internal/parser/asciidoc/AsciiDocStreamParser.java
parents f146134d 02f310ae
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment