Skip to content
Snippets Groups Projects
Commit a2ba753a authored by Alexander Rose's avatar Alexander Rose
Browse files

Merge branch 'master' into volume

# Conflicts:
#	src/apps/structure-info/volume.ts
#	src/mol-plugin/state/actions/basic.ts
#	src/mol-plugin/state/transforms/model.ts
parents 540727b2 ac637b67
Branches
Tags
No related merge requests found
Showing
with 267 additions and 132 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment