Benjamin 2b7b0a36d5 Merge branch 'dev' into benjamin ...

# Conflicts:
#	app/src/main/resources/appdata.json

2022-03-19 11:47:25 +01:00

..

src

Merge branch 'dev' into benjamin

2022-03-19 11:47:25 +01:00

build.gradle

BCrypt implémenté (voir dépendance jBCrypt)

2022-03-15 09:26:29 +01:00