Maximilien LEDOUX ac0b940f93 Merge branch 'dev' into maximilien ... # Conflicts: # app/src/main/java/lightcontainer/protocol/rules/writer/GetFileOkRule.java # app/src/main/resources/appdata.json		2022-03-15 19:49:49 +01:00
..
src	Merge branch 'dev' into maximilien	2022-03-15 19:49:49 +01:00
build.gradle	BCrypt implémenté (voir dépendance jBCrypt)	2022-03-15 09:26:29 +01:00