Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

d6089a81

Commit d6089a81 authored 3 years ago by Daniel Hornung

Downloads
- Plain Diff

Merge branch 'dev' into f-doc-inheritance

parents e9a5e30d 9619d462

No related branches found

No related tags found

1 merge request!22DOC: Update and extend importance and inheritance

Pipeline #9231 passed 3 years ago

Stage: test

Stage: deploy

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

conf/core/server.conf 2 additions, 2 deletions

conf/core/server.conf
src/doc/Glossary.md 4 additions, 4 deletions

src/doc/Glossary.md
src/doc/concepts.rst 1 addition, 1 deletion

src/doc/concepts.rst
src/doc/permissions.rst 0 additions, 0 deletions

src/doc/permissions.rst
src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseConnectionPool.java 55 additions, 11 deletions

.../backend/implementation/MySQL/DatabaseConnectionPool.java

with 62 additions and 18 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