Merge remote-tracking branch 'refs/remotes/origin/master'

docker · Sep 17, 2018 · 33551d9 · 33551d9
2 parents d335649 + 9a3dad0
commit 33551d9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 0 deletions.
diff --git a/shibboleth-integration/mp-gr/midpoint-server/container_files/usr-local-bin/entrypoint.sh b/shibboleth-integration/mp-gr/midpoint-server/container_files/usr-local-bin/entrypoint.sh
diff --git a/shibboleth-integration/mp-gr/midpoint-server/container_files/usr-local-bin/library.sh b/shibboleth-integration/mp-gr/midpoint-server/container_files/usr-local-bin/library.sh