diff options
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class
Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class
Diffstat (limited to 'Dozentenmodul/bin/thrift/ImageServer$authenticate_args$authenticate_argsTupleSchemeFactory.class')
0 files changed, 0 insertions, 0 deletions
