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

Merge branch 'master' of wrzh072.rzhousing.uni-wuerzburg.de:aggregator 

Conflicts:
	src/main/java/info/textgrid/services/aggregator/GenericExceptionMapper.java
	src/main/java/info/textgrid/services/aggregator/epub/EPUB.java
	src/test/java/info/textgrid/services/aggregator/EPUBTest.java

git-svn-id: https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/services/aggregator@13732 7c539038-3410-0410-b1ec-0f2a7bf1c452
parent 900ad360
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment