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

Merge branch 'master' of https://github.com/molstar/molstar-proto

# Conflicts:
#	src/mol-model-formats/structure/mmcif/parser.ts
parents dda4eb27 cf6f5026
No related branches found
No related tags found
No related merge requests found
Showing
with 198 additions and 137 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment