Maximilien LEDOUX 64fd230294 Merge branch 'maximilien' into dev ... # Conflicts: # app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java # app/src/main/resources/appdata.json		2022-03-12 18:06:47 +01:00
..
src	Merge branch 'maximilien' into dev	2022-03-12 18:06:47 +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