Commit c8b10b12 authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Merge branch 'integration-master' of...

Merge branch 'integration-master' of https://git.epam.com/go3-nrg/platform/System/file into integration-master

# Conflicts:
#	provider/file-gcp-datastore/src/main/resources/application.properties
#	provider/file-gcp/src/main/resources/application.properties
parents 8a765f5d c911fd98
Pipeline #4344 failed with stage
in 1 minute and 50 seconds