Merge branch 'T25025-seg-rework-plugin' of https://phabricator.mitk.org/source/mitk into T25025-seg-rework-plugin
- Conflicts:
- Modules/CppRestSdk/include/mitkRESTServer.h
Merge branch 'T25025-seg-rework-plugin' of https://phabricator.mitk.org/source/mitk into T25025-seg-rework-plugin
• steint | Authored on Oct 9 2018, 6:32 PM |
• steint | Pushed on Oct 9 2018, 6:34 PM |