Closed hofnerb closed 7 years ago
test if master and devel can be merged
cannot be properly merged as some files should not be overwritten. manual merge needed. I'll do this offline
test if master and devel can be merged