Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

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

Snippets Groups Projects

dd9deaa3

Verified Commit dd9deaa3 authored 4 years ago by Timm Fitschen

Downloads
- Plain Diff

Merge branch 'dev' into f-one-time-tokens

parents dd9c0f91 e571639d

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab/merge_request_templates/Default.md 48 additions, 0 deletions

.gitlab/merge_request_templates/Default.md
CHANGELOG.md 7 additions, 11 deletions

CHANGELOG.md
misc/pam_authentication/ldap.conf 1 addition, 1 deletion

misc/pam_authentication/ldap.conf
misc/pam_authentication/ldap_authentication.sh 12 additions, 6 deletions

misc/pam_authentication/ldap_authentication.sh
src/main/java/caosdb/server/ServerProperties.java 4 additions, 1 deletion

src/main/java/caosdb/server/ServerProperties.java

with 72 additions and 19 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