Skip to content
Snippets Groups Projects
Commit edafc8a4 authored by Christoph Groth's avatar Christoph Groth
Browse files

Merge branch 'master' into devel 

Conflicts:
	kwant/plotter.py
parents 36abc330 3a64ec46
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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