Willem Dantuma b93218e165 Merge branch 'develop' into feature/Resurect_3D ... # Conflicts: # angular.json # package-lock.json # package.json # projects/common-map/package.json		2020-09-26 12:17:58 +02:00
..
common	Fix versions	2020-09-26 10:03:15 +02:00
common-map	Merge branch 'develop' into feature/Resurect_3D	2020-09-26 12:17:58 +02:00