src/main/webapp/WEB-INF/spring/spring-main.xml · 0ed1cef699771ddceb5d4a9c61417d1f37729b84 · ARSnova / ARSnova Backend

Merge remote-tracking branch 'origin/master' into customization · 0438d06b

Daniel Gerhardt authored 10 years ago

Conflicts:
	src/main/java/de/thm/arsnova/dao/CouchDBDao.java
	src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
	src/main/webapp/WEB-INF/spring/arsnova-servlet.xml
	src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
	src/test/resources/arsnova.properties.example

0438d06b

spring-main.xml 3.03 KiB