Armin Schrenk 2f17d80fe6 Revert "removed license dir, renamed merge file and adjusted paths" 2 years ago
..
merges 2f17d80fe6 Revert "removed license dir, renamed merge file and adjusted paths" 2 years ago