Skip to content
Snippets Groups Projects
Commit 4da527b7 authored by Jan Janssen's avatar Jan Janssen
Browse files

Merge remote-tracking branch 'origin/master' into updates

# Conflicts:
#	resources/lammps/potentials/potentials_lammps.csv
parents da9a7101 25c984a6
No related branches found
No related tags found
No related merge requests found
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