Merge remote-tracking branch 'origin/preview/NU-1778-activities' into… · TouK/nussknacker@de349f7 · GitHub

Commit

Merge remote-tracking branch 'origin/preview/NU-1778-activities' into…

Browse files

… preview/NU-1778-activities

# Conflicts:
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Activities should display activities #1.png
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Activities should display activities #2.png
#	designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Activities should display activities #3.png

Loading branch information

Dzuming committed Oct 24, 2024

2 parents f2471a0 + 79502c1 commit de349f7