diff options
| author | Florian Zschocke <florian.zschocke@devolo.de> | 2019-11-06 12:39:55 +0100 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@devolo.de> | 2019-11-06 12:39:55 +0100 |
| commit | 719afbacd0b0e5333bbb72953a9df9d876b3ea33 (patch) | |
| tree | aec9cd23760a20b40f02b942a2fe4b497b9a1b3c /src/site | |
| parent | 41e6a701953c6f3ec0c4b2375426e4205a1c6a00 (diff) | |
| parent | b85267c81bac8168186ec78dace3ef2ec6b8cf24 (diff) | |
| download | gitblit-719afbacd0b0e5333bbb72953a9df9d876b3ea33.tar.gz gitblit-719afbacd0b0e5333bbb72953a9df9d876b3ea33.zip | |
Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.
Diffstat (limited to 'src/site')
| -rw-r--r-- | src/site/administration.mkd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/site/administration.mkd b/src/site/administration.mkd index 049a8273..fed71e8a 100644 --- a/src/site/administration.mkd +++ b/src/site/administration.mkd @@ -169,7 +169,7 @@ Usernames must be unique and are case-insensitive. Whitespace is illegal.
### Passwords
-User passwords are CASE-SENSITIVE and may be *plain*, *md5*, or *combined-md5* formatted (see `gitblit.properties` -> *realm.passwordStorage*).
+User passwords are CASE-SENSITIVE and may be *plain*, *md5*, *combined-md5* or *pbkdf2* formatted (see `gitblit.properties` -> *realm.passwordStorage*).
### User Roles
There are four actual *roles* in Gitblit:
|