Skip to content
Snippets Groups Projects
Commit 9a64e280 authored by Thorsten Vitt's avatar Thorsten Vitt
Browse files

Merge branch 'release/1.4.6' 

Conflicts:
	src/main/webapp/tei-stylesheets
parents 9cb7a415 cc38d13a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1675 additions and 15 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment