Commit 89c5ff36 authored by Thomas Citharel's avatar Thomas Citharel
Browse files

Merge branch 'develop' into 'master'

Update composer.lock

See merge request framasoft/framadate!238
parents 4f402f60 a1fbe394
This diff is collapsed.
Markdown is supported
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