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

Merge branch 'feature_connectors' 

Conflicts:
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/java/de/thm/arsnova/services/SessionService.java
	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
parents 9886c0e1 06d6e6f1
Hide whitespace changes
Inline Side-by-side
Showing
with 248 additions and 6 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