Skip to content
Snippets Groups Projects
Commit b4f20965 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

Merge branch '21.6' into '21.6-jetrec'

# Conflicts:
#   Generators/Rivet_i/share/setupRivet.sh
parents dd04c1b9 9168b564
No related branches found
No related tags found
Loading
Showing with 29 additions and 21 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment