diff options
| author | Nino Breuer | 2014-11-18 15:33:53 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-11-18 15:33:53 +0100 |
| commit | 423e985696f29982c41076d64618bf157ddedbaa (patch) | |
| tree | 405cf77cabe7909f868f652c10a902a645204970 /dozentenmodul/src/main/java/util/ResourceLoader.java | |
| parent | • fixed bug, where there could only be one image and one lecture with the s... (diff) | |
| parent | - (diff) | |
| download | tutor-module-423e985696f29982c41076d64618bf157ddedbaa.tar.gz tutor-module-423e985696f29982c41076d64618bf157ddedbaa.tar.xz tutor-module-423e985696f29982c41076d64618bf157ddedbaa.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodulserver/src/main/java/server/ServerHandler.java
dozentenmodulserver/src/main/java/sql/SQL.java
Diffstat (limited to 'dozentenmodul/src/main/java/util/ResourceLoader.java')
0 files changed, 0 insertions, 0 deletions