Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-server
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

04f43a4d

Verified Commit 04f43a4d authored 4 weeks ago by Daniel Hornung

Downloads
- Plain Diff

Merge branch 'dev' into f-remove-dropoffbox

parents abac15b6 ebb1d766

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 28 additions, 10 deletions

CHANGELOG.md
CITATION.cff 2 additions, 2 deletions

CITATION.cff
DEPENDENCIES.md 1 addition, 1 deletion

DEPENDENCIES.md
Makefile 4 additions, 2 deletions

Makefile
conf/core/server.conf 1 addition, 1 deletion

conf/core/server.conf
pom.xml 1 addition, 1 deletion

pom.xml
src/doc/conf.py 2 additions, 2 deletions

src/doc/conf.py

with 39 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment