Merge remote-tracking branch 'origin/issue/4230' into issue/4230 · OpenCTI-Platform/opencti@621f8ab · GitHub

Commit

Merge remote-tracking branch 'origin/issue/4230' into issue/4230

Browse files

# Conflicts:
#	opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternsMatrix.jsx
#	opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternsMatrix.tsx
#	opencti-platform/opencti-front/src/private/components/techniques/attack_patterns/AttackPatternsMatrixColumns.jsx

Loading branch information

Gwendoline-FAVRE-FELIX committed Sep 6, 2024

2 parents 9cced6e + 201dd8c commit 621f8ab