-
https://github.com/ISTIC-TENNIS/androidrakam authored
Conflicts: app/src/main/java/fr/istic/masteru/android/activities/HomeActivity.java app/src/main/java/fr/istic/masteru/android/automate/FileManager.java
fa542f60
Conflicts: app/src/main/java/fr/istic/masteru/android/activities/HomeActivity.java app/src/main/java/fr/istic/masteru/android/automate/FileManager.java