Commit 5fb312ef authored by Christoph Hasse's avatar Christoph Hasse 🤸🏻
Browse files

Merge branch 'particle_container_merger' into 'master'

Implement a thread-safe particle container merger.

See merge request !994
parents ab933d2f d55ab7ec
Pipeline #3094188 passed with stage
in 21 seconds