Skip to content
Snippets Groups Projects
Commit 6c70837a authored by Theo Steininger's avatar Theo Steininger
Browse files

Merge branch 'master' into multi_power_synth

# Conflicts:
#	nifty/field.py
parents 71512cab 9ba59e8c
No related branches found
No related tags found
1 merge request!78Multi power synth
Showing
with 131 additions and 175 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment