Merge master into develop
Conflicts: vendor/autoload.php vendor/composer/InstalledVersions.php vendor/composer/autoload_files.php vendor/composer/autoload_real.php vendor/composer/autoload_static.php vendor/composer/installed.json vendor/composer/installed.php
Showing
- vendor/autoload.php 1 addition, 1 deletionvendor/autoload.php
- vendor/composer/InstalledVersions.php 2 additions, 2 deletionsvendor/composer/InstalledVersions.php
- vendor/composer/autoload_files.php 1 addition, 0 deletionsvendor/composer/autoload_files.php
- vendor/composer/autoload_real.php 7 additions, 7 deletionsvendor/composer/autoload_real.php
- vendor/composer/autoload_static.php 6 additions, 5 deletionsvendor/composer/autoload_static.php
- vendor/composer/installed.json 2 additions, 2 deletionsvendor/composer/installed.json
- vendor/composer/installed.php 2 additions, 2 deletionsvendor/composer/installed.php
Please register or sign in to comment