Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

c21e4d0c

Commit c21e4d0c authored 5 years ago by Daniel

Downloads
- Plain Diff

Merge branch 'dev' into f-fix-14

parents 41295e1f 3e044b0a

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 7 additions, 3 deletions

CHANGELOG.md
conf/core/server.conf 4 additions, 4 deletions

conf/core/server.conf
src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java 18 additions, 16 deletions

src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java
src/main/java/caosdb/server/permissions/EntityPermission.java 1 addition, 1 deletion

...main/java/caosdb/server/permissions/EntityPermission.java

with 30 additions and 24 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