Skip to content
Commit 92502531 authored by benoit manager's avatar benoit manager
Browse files

Merge branch '1.2-fixes' into 'master' 

merge 1.2 fixes into master

See merge request fusiondirectory/fd!266
parents e2d13694 384ff14f
Expand all 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