Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

6b3663a6

Verified Commit 6b3663a6 authored 4 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-versioning

parents 6b332205 6e8b8efe

Branches

Tags

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 2 additions, 0 deletions

CHANGELOG.md
misc/pam_authentication/ldap.conf 5 additions, 4 deletions

misc/pam_authentication/ldap.conf
misc/pam_authentication/ldap_authentication.sh 1 addition, 1 deletion

misc/pam_authentication/ldap_authentication.sh
src/main/java/caosdb/server/resource/SharedFileResource.java 6 additions, 1 deletion

src/main/java/caosdb/server/resource/SharedFileResource.java
src/main/java/caosdb/server/utils/ServerMessages.java 1 addition, 1 deletion

src/main/java/caosdb/server/utils/ServerMessages.java

with 15 additions and 7 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