Skip to content
Snippets Groups Projects
Commit d5018bcd authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'master' into '557-pathways-and-compartments' 

# Conflicts:
#   model-command/src/main/java/lcsb/mapviewer/commands/CreateHierarchyCommand.java
#   service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java
#   service/src/test/java/lcsb/mapviewer/services/impl/ProjectServiceTest.java
parents 9cde9780 9f3a3f5c
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!489Resolve "Pathways and compartments overlay is unavailable if using Custom Semantic Zoom"
Pipeline #7232 passed
Hide whitespace changes
Inline Side-by-side
Showing
with 340 additions and 320 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment