Skip to content
Snippets Groups Projects
Commit ec27f5d3 authored by Christoph Thelen's avatar Christoph Thelen
Browse files

Merge remote-tracking branch 'origin/master' into merge branch 

Conflicts:
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
parents d18c2383 31a2613b
Hide whitespace changes
Inline Side-by-side
Showing
with 255 additions and 15 deletions
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