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

Merge branch 'master' into '7-element-fur-erhaltungszustand-2' 

# Conflicts:
#   schema/edxml.rng
parents e133c44f 5995cf7c
No related branches found
No related tags found
1 merge request!23Resolve "Element für Erhaltungszustand"
Hide whitespace changes
Inline Side-by-side
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