OO-2916: Resolve issues from merging
Showing
- src/main/java/org/olat/basesecurity/AuthHelper.java 2 additions, 2 deletionssrc/main/java/org/olat/basesecurity/AuthHelper.java
- src/main/java/org/olat/modules/card2brain/manager/Card2BrainManagerImpl.java 8 additions, 0 deletions...lat/modules/card2brain/manager/Card2BrainManagerImpl.java
- src/main/resources/serviceconfig/olat.properties 157 additions, 56 deletionssrc/main/resources/serviceconfig/olat.properties
Loading
Please register or sign in to comment