Commit f82bdd0b authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'b24' 

# Conflicts:
#	composer.json
parents 0c28c2f5 1655f5b5