EndMove b1ff4140c2 Merge branch 'dev' into jeremi ... # Conflicts: # app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java		2022-03-12 14:43:24 +01:00
..
src	Merge branch 'dev' into jeremi	2022-03-12 14:43:24 +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