Merge branch 'master' into learning_path
Conflicts: src/main/resources/serviceconfig/olat.properties
No related branches found
No related tags found
Showing
- src/main/java/org/olat/admin/_i18n/LocalStrings_ar.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_ar.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_bg.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_bg.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_cs.properties 0 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_cs.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_da.properties 0 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_da.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_de.properties 2 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_el.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_el.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 1 addition, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_es.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_es.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_fr.properties 2 additions, 3 deletions...main/java/org/olat/admin/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_it.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_it.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_jp.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_jp.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_lt.properties 0 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_lt.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties 0 additions, 2 deletions...n/java/org/olat/admin/_i18n/LocalStrings_nl_NL.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pl.properties 0 additions, 2 deletions...main/java/org/olat/admin/_i18n/LocalStrings_pl.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pt_BR.properties 0 additions, 1 deletion...n/java/org/olat/admin/_i18n/LocalStrings_pt_BR.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_pt_PT.properties 0 additions, 1 deletion...n/java/org/olat/admin/_i18n/LocalStrings_pt_PT.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_ru.properties 0 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_ru.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_sq.properties 0 additions, 1 deletion...main/java/org/olat/admin/_i18n/LocalStrings_sq.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_zh_CN.properties 0 additions, 1 deletion...n/java/org/olat/admin/_i18n/LocalStrings_zh_CN.properties
- src/main/java/org/olat/admin/_i18n/LocalStrings_zh_TW.properties 0 additions, 2 deletions...n/java/org/olat/admin/_i18n/LocalStrings_zh_TW.properties
Loading
Please register or sign in to comment