Commit 1daac298 authored by Eugene Pin's avatar Eugene Pin
Browse files

Merge branch 'master' of https://gitlab.utc.fr/lo21_pin_noir_boucher_bouri_detree/cellulutlo21

Réglage de conflits dans test.pro et src.pro
parents 2898c4fe e177b295
Pipeline #77937 passed with stages
in 16 seconds