Merge branch '1.0-composer-lock' into 1.0

This commit is contained in:
terrafrost 2016-10-22 23:38:39 -05:00
commit b99345704a

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "ef3ada42c17aee960068e0a98b4de602",
"hash": "24648c5326ee237cd79bb0d311b16cb8",
"content-hash": "cec0167a357df0f3da215133e2424a6c",
"packages": [],
"packages-dev": [