From: Florian Zschocke <florian.zschocke@devolo.de>
Date: Wed, 6 Nov 2019 11:39:55 +0000 (+0100)
Subject: Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.
X-Git-Tag: r1.9.0~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=719afbacd0b0e5333bbb72953a9df9d876b3ea33;p=gitblit.git

Merge branch 'pingunaut-1166_more_secure_password_hashes' into master.
---

719afbacd0b0e5333bbb72953a9df9d876b3ea33
diff --cc src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 0a6981b3,94dd35ab..5b0b0147
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@@ -20,8 -20,8 +20,9 @@@ import java.util.ArrayList
  import java.util.Collections;
  import java.util.Iterator;
  import java.util.List;
 +import java.util.Locale;
  
+ import com.gitblit.utils.PasswordHash;
  import org.apache.wicket.PageParameters;
  import org.apache.wicket.behavior.SimpleAttributeModifier;
  import org.apache.wicket.extensions.markup.html.form.palette.Palette;