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

Merge branch 'master' into bond-repr 

# Conflicts:
#	src/apps/structure-info/model.ts
#	src/mol-geo/theme/structure/color/chain-id.ts
#	src/mol-model/structure/model/model.ts
#	src/mol-model/structure/structure/structure.ts
parents 900c8d6e 25965d30
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 519 additions and 356 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