Skip to content
Snippets Groups Projects
Commit 169f3434 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'dev' into release-0.10.0

parents 2a897799 02458a03
No related branches found
No related tags found
1 merge request!100WIP: Filling XLSX: Seems to be working.
Pipeline #50271 passed
Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
README.md
+ 1
− 1
View file @ 169f3434
...@@ -52,7 +52,7 @@ Conduct](https://gitlab.com/caosdb/caosdb/-/blob/dev/CODE_OF_CONDUCT.md). ...@@ -52,7 +52,7 @@ Conduct](https://gitlab.com/caosdb/caosdb/-/blob/dev/CODE_OF_CONDUCT.md).
* Copyright (C) 2018 Research Group Biomedical Physics, Max Planck Institute * Copyright (C) 2018 Research Group Biomedical Physics, Max Planck Institute
for Dynamics and Self-Organization Göttingen. for Dynamics and Self-Organization Göttingen.
* Copyright (C) 2020-2021 Indiscale GmbH <info@indiscale.com> * Copyright (C) 2020-2023 Indiscale GmbH <info@indiscale.com>
All files in this repository are licensed under a [GNU Affero General Public All files in this repository are licensed under a [GNU Affero General Public
License](LICENCE.md) (version 3 or later). License](LICENCE.md) (version 3 or later).
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment