diff options
| author | Christian Klinger | 2016-08-08 12:43:23 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-08-08 12:43:23 +0200 |
| commit | 97331661c3e0f3371056dcb592f072a8591b0230 (patch) | |
| tree | b588be057e3ce4e8e41f607ca71a42514c8f95a1 /dozentenmodul/src/main/java | |
| parent | [server] Supply netrules and runscript via webrpc (diff) | |
| parent | changes. (diff) | |
| download | tutor-module-97331661c3e0f3371056dcb592f072a8591b0230.tar.gz tutor-module-97331661c3e0f3371056dcb592f072a8591b0230.tar.xz tutor-module-97331661c3e0f3371056dcb592f072a8591b0230.zip | |
Merge branch 'feature/mail-templates' into v1.1
Conflicts:
dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
Diffstat (limited to 'dozentenmodul/src/main/java')
0 files changed, 0 insertions, 0 deletions