Skip to content
Snippets Groups Projects
Commit b4f02923 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch 'master' into issue-6674 

Conflicts:
	src/main/webapp/WEB-INF/spring/spring-main.xml
parents 4ced0863 ef324c77
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