Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:Maslosoft/EmbeDi
# Conflicts: # composer.json # composer.lock # tests/unit/Adapters/YiiTest.php # tests/unit/ConfigureCompoundComponentTest.php # tests/unit/ConfigureSimpleComponentTest.php # tests/unit/EmbeDi/ApplyTest.php # tests/unit/EmbeDi/ExportTest.php # tests/unit/Source/ApplyTest.php # tests/unit/StaticStorage/NamedStorageTest.php # tests/unit/StaticStorageTest.php # tests/unit/Storage/PersisterTest.php
- Loading branch information