Beginning with 2nd June, only the "Single Sign On" option for login to the GitLab web interface will be possible. If you don't have an MPCDF wide second factor so far, please get one at our SelfService (https://selfservice.mpcdf.mpg.de). The GitLab internal second factor will not work.

Commit 221486b1 authored 8 years ago by theos

Merge branch 'master' into NIFTy3_temp

# Conflicts:
#	lm/__init__.py
#	lm/nifty_lm.py
#	rg/nifty_fft.py

parents c65a30a8 45ec5251

No related branches found

No related tags found

1 merge request!29Nif ty3 temp

Hide whitespace changes

Inline Side-by-side

Showing with 27 additions and 11 deletions

Please register or to comment

Admin message

Merge branch 'master' into NIFTy3_temp