diff options
| author | Nino Breuer | 2014-10-07 10:16:49 +0200 |
|---|---|---|
| committer | Nino Breuer | 2014-10-07 10:16:49 +0200 |
| commit | 5a1a0930d7893f4479ff48177b13e4554173c677 (patch) | |
| tree | 10c6e39bb4ff9d281ade38f40e0837c8d6657709 /dozentenmodulserver/src/main/java/server/ServerHandler.java | |
| parent | Removed (now) unused GUIs (diff) | |
| parent | [client] now also remember the "technisch-info" wenn going back a page (diff) | |
| download | tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.tar.gz tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.tar.xz tutor-module-5a1a0930d7893f4479ff48177b13e4554173c677.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
g
Diffstat (limited to 'dozentenmodulserver/src/main/java/server/ServerHandler.java')
0 files changed, 0 insertions, 0 deletions