3.01-QCM_MuscuMaths

Author	SHA1	Message	Date
Jeremy DUCOURTHIAL	51c57bdcea	fix : réparation du merge continuous-integration/drone/push Build is passing Details	1 year ago
Jeremy DUCOURTHIAL	4978d87065	Merge remote-tracking branch 'origin/master' continuous-integration/drone/push Build is passing Details # Conflicts: # Android/app/src/main/AndroidManifest.xml # Android/app/src/main/java/com/example/mathseduc/MainActivity.kt # Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml # Android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml # Android/app/src/main/res/values/strings.xml # Android/gradle/wrapper/gradle-wrapper.properties	1 year ago
Jeremy DUCOURTHIAL	4d8fa0e13e	feat : ajout android 21 base projet	1 year ago
Yvan CALATAYUD	8e84ae99a1	init Android project	1 year ago