Arthur
Comparer les modifications
Fichiers
12- Arthur Schamroth rédigé
# Conflicts: # app/src/main/res/layout/activity_workout.xml # app/src/main/res/layout/help_creation_program_popup.xml
# Conflicts: # app/src/main/res/layout/activity_workout.xml # app/src/main/res/layout/help_creation_program_popup.xml