diff options
| author | Michael Wilson | 2014-10-16 15:21:03 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-10-16 15:21:03 +0200 |
| commit | 6e9327cb4378280811d65b83d7ca115cd636382e (patch) | |
| tree | 59eaf1b0ea5130d7dc90895a090c61a42631bc98 /dozentenmodulserver/src/main/java/sql | |
| parent | - (diff) | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| download | tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.tar.gz tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.tar.xz tutor-module-6e9327cb4378280811d65b83d7ca115cd636382e.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/intro/Login_GUI.java
Diffstat (limited to 'dozentenmodulserver/src/main/java/sql')
0 files changed, 0 insertions, 0 deletions