Skip to content
GitLab
Commit 4421507c authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch 'cherry-pick-c9d6d88b' into '1.2.1-fixes' 

Merge branch '5816-blacklist-is-not-reset-correctly-for-userattribute' into '1.2.1-fixes'

See merge request fusiondirectory/fd!342
parents c8f73cea 10db67cc
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 0 deletions
+17 -0
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment