Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

bd66ed7f

Verified Commit bd66ed7f authored Jan 22, 2021 by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-grpc

parents 6885dd10 605d46f9

No related branches found

No related tags found

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

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 5 additions, 0 deletions

CHANGELOG.md
README_SETUP.md 2 additions, 0 deletions

README_SETUP.md
conf/core/usersources.ini.template 8 additions, 3 deletions

conf/core/usersources.ini.template
src/doc/CaosDB-Query-Language.md 27 additions, 0 deletions

src/doc/CaosDB-Query-Language.md
src/doc/administration/maintenance.rst 8 additions, 0 deletions

src/doc/administration/maintenance.rst
src/main/java/org/caosdb/server/database/backend/transaction/IsSubType.java 20 additions, 3 deletions

...caosdb/server/database/backend/transaction/IsSubType.java
src/main/java/org/caosdb/server/database/backend/transaction/RetrieveFullEntity.java 52 additions, 19 deletions

...rver/database/backend/transaction/RetrieveFullEntity.java

with 122 additions and 25 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