Skip to content
Snippets Groups Projects
Commit 4905719e authored by PFEFFER Melvil's avatar PFEFFER Melvil
Browse files

Merge branch 'main' into 'testgoogleforms' 

# Conflicts:
#   app/src/main/java/com/example/myapplication/PhotoPage.java
parents 2565cfb2 4e894114
1 merge request!10Testgoogleforms merge to add the form modifications and link to google forms
Hide 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