Skip to content
GitLab
Commit 56415b41 authored by bmortier's avatar bmortier
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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
+2 -1
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