Merge branch 'develop' into 'master'
Regular merge of develop See merge request !19 Former-commit-id: aa2723a3
No related branches found
No related tags found
Showing
- .ci/.autoRedirect 4 additions, 4 deletions.ci/.autoRedirect
- .ci/deploy.sh 1 addition, 1 deletion.ci/deploy.sh
- .gitattributes 3 additions, 0 deletions.gitattributes
- .gitignore 23 additions, 1 deletion.gitignore
- _config.yml 3 additions, 3 deletions_config.yml
- assets/banners/howto-card/banner.svg 1 addition, 0 deletionsassets/banners/howto-card/banner.svg
- assets/banners/howto-card/logos.svg 0 additions, 0 deletionsassets/banners/howto-card/logos.svg
- assets/banners/howto-card/motto.svg 0 additions, 0 deletionsassets/banners/howto-card/motto.svg
- assets/banners/labcard/banner.svg 0 additions, 1 deletionassets/banners/labcard/banner.svg
- external/daisy/at_a_glance.md 7 additions, 7 deletionsexternal/daisy/at_a_glance.md
- external/daisy/contract_management.md 13 additions, 13 deletionsexternal/daisy/contract_management.md
- external/daisy/daisy.md 1 addition, 1 deletionexternal/daisy/daisy.md
- external/daisy/dataset_management.md 46 additions, 46 deletionsexternal/daisy/dataset_management.md
- external/daisy/definitions_management.md 13 additions, 13 deletionsexternal/daisy/definitions_management.md
- external/daisy/images/.gitattributes 0 additions, 1 deletionexternal/daisy/images/.gitattributes
- external/daisy/interface_conventions.md 17 additions, 17 deletionsexternal/daisy/interface_conventions.md
- external/daisy/project_management.md 48 additions, 48 deletionsexternal/daisy/project_management.md
- external/daisy/user_management.md 7 additions, 7 deletionsexternal/daisy/user_management.md
- external/exchange-channels/.gitattributes 0 additions, 1 deletionexternal/exchange-channels/.gitattributes
- external/exchange-channels/duma.md 13 additions, 13 deletionsexternal/exchange-channels/duma.md
.gitattributes
0 → 100644
assets/banners/howto-card/banner.svg
0 → 100644
File moved
File moved
assets/banners/labcard/banner.svg
deleted
100644 → 0
external/daisy/images/.gitattributes
deleted
100644 → 0
Please register or sign in to comment