Skip to content
Snippets Groups Projects
Commit b2ebfaba authored by Paul-Christian Volkmer's avatar Paul-Christian Volkmer
Browse files

Merge branch 'master' into ldap_integration 

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/spring/spring-main.xml
parents 9df59b73 ef324c77
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.
Finish editing this message first!
Please register or to comment