solve merge conflicts

Browse Source

...

This commit is contained in:

x

2025-04-25 19:11:00 -04:00

parent 3f00359459 f93edbb37f

commit b6566943c6

184 changed files with 3938 additions and 489 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/aws/iam-role-secret-rotation-permissions.png

BIN

Binary file not shown.

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

docs/images/app-connections/general/add-connection.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 974 KiB After Width:  |  Height:  |  Size: 1.1 MiB

docs/images/app-connections/teamcity/teamcity-app-connection-created.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-app-connection-modal.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-app-connection-option.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-main-page.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-token-copy.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-token-created.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-token-page.png

BIN

Binary file not shown.

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

docs/images/app-connections/teamcity/teamcity-token-popup.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-configuration.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-confirm.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-created.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-details.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-option.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-parameters.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-secrets-mapping.png

BIN

Binary file not shown.

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

docs/images/secret-rotations-v2/aws-iam-user-secret/aws-iam-user-secret-user-names.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/general/secret-sync-tab.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 950 KiB After Width:  |  Height:  |  Size: 1.1 MiB

docs/images/secret-syncs/teamcity/select-teamcity-option.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-created.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-destination.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-details.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-options.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-review.png

BIN

Binary file not shown.

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

docs/images/secret-syncs/teamcity/teamcity-sync-source.png

BIN

Binary file not shown.

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