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

Merge remote-tracking branch 'private/master' 

Conflicts:
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
parents 7ae2a9e3 64bfc50e
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