Skip to content
Snippets Groups Projects
Trj Viewer

Trj Viewer Archived

Project ID: 149
Leif-Kristof Schultz's avatar
Merge remote-tracking branch 'origin/feature/#130-tool-color-gradient' into development
Leif-Kristof Schultz authored
# Conflicts:
#	src/app/core/services/colors/colors.service.ts
#	src/app/modules/dockable-workspace/dockable-workspace.module.ts
#	src/app/modules/dockable-workspace/viewer/beads/instanced-object.builder.ts
#	src/app/modules/dockable-workspace/viewer/beads/linker-dna.builder.ts
#	src/app/modules/dockable-workspace/viewer/beads/multiple-mesh-bead.builder.ts
730f34a6
History
Name Last commit Last update