diff options
| author | Jonathan Bauer | 2015-07-23 15:51:48 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-07-23 15:51:48 +0200 |
| commit | 363e8c3ee2b34355031acc9b6b46cac0dfbf56f2 (patch) | |
| tree | 5a8580754cd2b1514c3bc978ad3135ac43d20e9c /dozentenmodulserver/src/main/java | |
| parent | Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1 (diff) | |
| download | tutor-module-363e8c3ee2b34355031acc9b6b46cac0dfbf56f2.tar.gz tutor-module-363e8c3ee2b34355031acc9b6b46cac0dfbf56f2.tar.xz tutor-module-363e8c3ee2b34355031acc9b6b46cac0dfbf56f2.zip | |
[client] fix bad merge
Diffstat (limited to 'dozentenmodulserver/src/main/java')
0 files changed, 0 insertions, 0 deletions