EndMove a9a620275d Merge branch 'jeremi' into dev ... # Conflicts: # app/src/main/resources/appdata.json		2022-03-12 22:16:46 +01:00
..
src	Merge branch 'jeremi' into dev	2022-03-12 22:16:46 +01:00
build.gradle	Système de synchronisation de l'information entre FileFrontEnd<>StorBackEnd -> implémentation de AppData + ajout de la bibliothèque GSON à build.gradle	2022-03-05 16:51:12 +01:00