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

Merge branch 'master' into gl-geo, changed Location.atom to .element

# Conflicts:
#	src/mol-io/common/binary-cif/array-encoder.ts
#	src/perf-tests/chunked-array-vs-native.ts
parents 747f12bd 678701c2
No related branches found
No related tags found
No related merge requests found
Showing
with 404 additions and 395 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