Skip to content
Snippets Groups Projects
Commit 69a24634 authored by Max-Ferdinand Zeterberg's avatar Max-Ferdinand Zeterberg
Browse files

Merge branch 'master' into '37-replace-uuid' 

# Conflicts:
#   scenarios/xslt/edxml2html/libs/html-philology.lib.xsl
parents ad78185b d9e0b24a
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2182 additions and 48 deletions
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