Skip to content
Snippets Groups Projects
Commit c09ffe17 authored by Aleksandr Konstantinov's avatar Aleksandr Konstantinov
Browse files

Merge branch 'next' into 'voms_openssl_34' 

# Conflicts:
#   src/hed/libs/credential/VOMSAttribute.h
parents 964be534 a6c21e38
Hide whitespace changes
Inline Side-by-side
Showing
with 175 additions and 514 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment