Benjamin a287bbdb59 Merge branch 'benjamin' into dev ... # Conflicts: # app/src/main/java/lightcontainer/protocol/rules/reader/SavefileRule.java # app/src/main/resources/appdata.json		2022-03-19 14:15:18 +01:00
..
src	Merge branch 'benjamin' into dev	2022-03-19 14:15:18 +01:00
build.gradle	BCrypt implémenté (voir dépendance jBCrypt)	2022-03-15 09:26:29 +01:00