Commit 460bcbec authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 3c9f5bc0 3cf36952
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -13,3 +13,5 @@ composer.phar
.phpunit.result.cache
.idea
/.php-cs-fixer.cache
deployments/*
Makefile