Skip to content
GitLab
Commit d197c212 authored by bmortier's avatar bmortier
Browse files

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

Merge branch…

See merge request fusiondirectory/fd!212
parents 2f6cb824 a2b05152
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 34 deletions
+46 -34
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