Merge branch 'master' into feature/procedure_wizard

This commit is contained in:
Peter Siegmund
2015-02-09 11:51:03 +01:00
382 changed files with 11240 additions and 10584 deletions
@@ -13,6 +13,10 @@
<param-name>dirAllowed</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<param-name>useFileMappedBuffer</param-name>
<param-value>false</param-value>
</init-param>
</servlet>
<!-- Apache Shiro -->