Benjamin 1689e2014f Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # app/src/main/resources/appdata.json		2022-03-14 11:12:59 +01:00
..
src	Merge remote-tracking branch 'origin/dev' into dev	2022-03-14 11:12:59 +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