Merge branch 'master' of https://c4science.ch/diffusion/9417/2019-bolt_caps
- 'master' of https://c4science.ch/diffusion/9417/2019-bolt_caps: Newest version including Elenor's changes
- Conflicts:
- TINS_2020/TINS.docx
preti | Feb 10 2020, 13:42 |
preti | Feb 10 2020, 13:42 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
ed6e8f87bbe9 | Thomas Bolton | Newest version including Elenor's changes | Feb 7 2020 |