Fix merge conflicts pulling master into staging

Browse Source

...

This commit is contained in:

Catherine Luse

2020-10-05 20:32:20 -07:00

parent e414513481 6d1d47358a

commit f79e1d9305

77 changed files with 8509 additions and 179 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/img/rancher/keycloak/keycloak-saml-client-builtin-mappers.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 200 KiB

assets/img/rancher/keycloak/keycloak-saml-client-configuration.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 282 KiB

assets/img/rancher/keycloak/keycloak-saml-client-group-mapper.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 KiB