Merge branch 'master' into 'add-office-hifis-net'
# Conflicts: # _layouts/team.html
No related branches found
No related tags found
Showing
- _layouts/team.html 60 additions, 1 deletion_layouts/team.html
- assets/css/frontpage.scss 2 additions, 2 deletionsassets/css/frontpage.scss
- assets/img/Helmholtz-centre-logos/DESY_logo_3C_web.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/DESY_logo_3C_web.png
- assets/img/Helmholtz-centre-logos/HZDR-LOGO-UNTERZEILE-HOCH-POS-RGB.png 0 additions, 0 deletions...mholtz-centre-logos/HZDR-LOGO-UNTERZEILE-HOCH-POS-RGB.png
- assets/img/Helmholtz-centre-logos/Logo_KIT.svg 103 additions, 0 deletionsassets/img/Helmholtz-centre-logos/Logo_KIT.svg
- assets/img/Helmholtz-centre-logos/awi_logo.svg 72 additions, 0 deletionsassets/img/Helmholtz-centre-logos/awi_logo.svg
- assets/img/Helmholtz-centre-logos/dkfz_pd.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/dkfz_pd.png
- assets/img/Helmholtz-centre-logos/dlr_logo_pd.svg 90 additions, 0 deletionsassets/img/Helmholtz-centre-logos/dlr_logo_pd.svg
- assets/img/Helmholtz-centre-logos/fzj.svg 56 additions, 0 deletionsassets/img/Helmholtz-centre-logos/fzj.svg
- assets/img/Helmholtz-centre-logos/gfz_pd.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/gfz_pd.png
- assets/img/Helmholtz-centre-logos/hmgu_pd.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/hmgu_pd.png
- assets/img/Helmholtz-centre-logos/hzb_pd.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/hzb_pd.png
- assets/img/Helmholtz-centre-logos/ufz_pd.png 0 additions, 0 deletionsassets/img/Helmholtz-centre-logos/ufz_pd.png
- team.md 2 additions, 0 deletionsteam.md
24.7 KiB
45.1 KiB
28.1 KiB
assets/img/Helmholtz-centre-logos/fzj.svg
0 → 100644
assets/img/Helmholtz-centre-logos/gfz_pd.png
0 → 100644
123 KiB
31.4 KiB
assets/img/Helmholtz-centre-logos/hzb_pd.png
0 → 100644
45.3 KiB
assets/img/Helmholtz-centre-logos/ufz_pd.png
0 → 100644
9.13 KiB