Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

0668a8d0

Verified Commit 0668a8d0 authored 3 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-grpc-main

parents 1edefc83 99dc8970

Branches

Tags

2 merge requests!44Release 0.6,!43Merge f-GRPC-main to dev

Pipeline #15448 passed 3 years ago

Stage: info

Stage: test

Stage: deploy

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
CHANGELOG.md 14 additions, 0 deletions

CHANGELOG.md
DEPENDENCIES.md 2 additions, 2 deletions

DEPENDENCIES.md
README_SETUP.md 5 additions, 0 deletions

README_SETUP.md
caosdb-webui 1 addition, 1 deletion

caosdb-webui
conf/core/server.conf 6 additions, 1 deletion

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

pom.xml
src/doc/conf.py 1 addition, 1 deletion

src/doc/conf.py

with 34 additions and 6 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