Skip to content
Snippets Groups Projects
Commit 8f808601 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

Merge branch 'dev' into f-admin-tools 

# Conflicts:
#	src/caosdb/utils/caosdb_admin.py
parents 5c0f60ca ecf16ac0
No related branches found
No related tags found
1 merge request!51Draft: FIX: fix the argument name
Pipeline #20497 passed
Stage: code_style
Stage: linting
Stage: test
Stage: deploy