Skip to content
Commit 81fada85 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

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

Merge branch '5776-merge-the-lighttpd-from-the-debian-package' into '1.3-dev'

See merge request fusiondirectory/fd!245
parents d31b7187 a3fe3bf6
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