edit composer.json
Merge branch '1.0-dev'