Merge branch 'master' into docstrings_energy_minimization
# Conflicts: # nifty/energies/energy.py # nifty/minimization/quasi_newton_minimizer.py
nifty/nifty_meta.py
0 → 100644
# Conflicts: # nifty/energies/energy.py # nifty/minimization/quasi_newton_minimizer.py