Merge remote-tracking branch 'origin/work-fe2-maxime-disable-peer-con… · dedis/popstellar@7f2021d · GitHub

Commit

Merge remote-tracking branch 'origin/work-fe2-maxime-disable-peer-con…

Browse files

…nection' into work-fe2-maxime-disable-peer-connection

# Conflicts:
#	fe2-android/app/src/main/java/com/github/dedis/popstellar/utility/handler/data/LaoHandler.kt

Loading branch information

Kaz-ookid committed May 19, 2024

2 parents d03c064 + 688ed67 commit 7f2021d