Fix merge conflicts

Browse Source

...

This commit is contained in:

Tuan Dang

2025-04-10 12:39:09 -07:00

parent eb11efcafa f15491d102

commit 77dd768a38

443 changed files with 17531 additions and 2266 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

docs/images/app-connections/mssql/create-username-and-password-method.png

BIN

Binary file not shown.

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

docs/images/app-connections/mssql/select-mssql-connection.png

BIN

Binary file not shown.

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

docs/images/app-connections/mssql/username-and-password-connection.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

docs/images/app-connections/postgres/create-username-and-password-method.png

BIN

Binary file not shown.

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

docs/images/app-connections/postgres/select-postgres-connection.png

BIN

Binary file not shown.

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

docs/images/app-connections/postgres/username-and-password-connection.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

docs/images/platform/admin-panels/access-org-admin-console.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 852 KiB After Width:  |  Height:  |  Size: 307 KiB

docs/images/platform/admin-panels/access-server-admin-panel.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 852 KiB After Width:  |  Height:  |  Size: 320 KiB

docs/images/platform/project-access-requests/access-comment.png

BIN

Binary file not shown.

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

docs/images/platform/project-access-requests/all-project-view.png

BIN

Binary file not shown.

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

docs/images/platform/project-access-requests/request-access.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/generic/add-secret-rotation.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-configuration.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-confirm.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-created.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-details.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-parameters.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/mssql-credentials/mssql-credentials-secrets-mapping.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/mssql-credentials/select-mssql-credentials-option.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-configuration.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-confirm.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-created.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 MiB

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-details.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-parameters.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/postgres-credentials-secrets-mapping.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/postgres-credentials/select-postgres-credentials-option.png

BIN

Binary file not shown.

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