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

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

Merge branch '5789-ldif-import-can-trigger-php-errors-on-empty-file' into '1.2.1-fixes'

See merge request fusiondirectory/fd!343
parents 50ddbdf6 cd9f51b8
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 2 deletions
+5 -2
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