diff options
| author | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2013-07-16 23:16:52 +0200 |
| commit | c3db9cb2b19a61f51f62a6fa3265ef3226aad69f (patch) | |
| tree | 938820118a406b170094c57a9073827f034c07a8 /composer.json | |
| parent | 70a9a28321c5226d597bb87319524747e714b133 (diff) | |
| parent | ae0cc3e868b1708067df22932c09874033a34be9 (diff) | |
Merge branch 'refs/heads/develop' into update/changelog
Conflicts:
user_guide_src/source/changelog.rst
user_guide_src/source/installation/downloads.rst
user_guide_src/source/installation/upgrade_214.rst
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 29715763f..0f98fe7a0 100644 --- a/composer.json +++ b/composer.json @@ -5,6 +5,6 @@ "php": ">=5.2.4" }, "require-dev": { - "mikey179/vfsStream": "*" + "mikey179/vfsStream": "1.1.*" } }
\ No newline at end of file |