Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/master' into develop
# Conflicts: # build.gradle # src/main/java/com/epam/reportportal/auth/endpoint/AuthConfigurationEndpoint.java # src/main/java/com/epam/reportportal/auth/endpoint/OAuthConfigurationEndpoint.java # src/main/java/com/epam/reportportal/auth/integration/AuthIntegrationType.java # src/main/java/com/epam/reportportal/auth/integration/converter/SamlConverter.java # src/main/java/com/epam/reportportal/auth/integration/handler/impl/GetSamlIntegrationsStrategy.java # src/main/java/com/epam/reportportal/auth/integration/parameter/ParameterUtils.java # src/main/java/com/epam/reportportal/auth/integration/parameter/SamlParameter.java
- Loading branch information