Skip to content
Snippets Groups Projects
Commit db92c531 authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Merge branch 'dev' into 'f-type-hints'

# Conflicts:
#   src/caosdb/common/models.py
parents 1e3e8edb 1ecb0883
Branches
Tags
2 merge requests!143Release 0.15.0,!67Add type hints to models.py
Pipeline #48473 passed
Showing with 180 additions and 875 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment