Skip to content
Commit 56415b41 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch 'cherry-pick-ac3c226d' into '1.2-fixes' 

Merge branch 'revert-5f944c7a' into '1.3-dev'

See merge request fusiondirectory/fd!216
parents 0e98773f 02a9450f
Hide whitespace changes
Inline Side-by-side
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