Skip to content
Snippets Groups Projects
Commit d25b3f58 authored by BIOUD Youcef's avatar BIOUD Youcef
Browse files

Merge branch 'youcef' into 'dev' 

# Conflicts:
#   IHM_Retouche_Photo/mainwindow.ui
parents 8ad1f92e a4d99bf0
No related branches found
No related tags found
1 merge request!1Dev
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment