diff options
author | dchill42 <dchill42@gmail.com> | 2012-10-21 01:39:40 +0200 |
---|---|---|
committer | dchill42 <dchill42@gmail.com> | 2012-10-21 01:39:40 +0200 |
commit | 9e4ebf1af81b0e5216a026fe4a99a19f2be6a831 (patch) | |
tree | 97ddddc6b7a65130672a168f522d7a69e515ec54 /composer.json | |
parent | e3621cc79fa4b4658768fea0694cc0ae52835d85 (diff) | |
parent | 8df1ae2d7e0fd441f7a1fc481c76c5c1edfadf23 (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into load_config_units
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 dc098acc3..7d60020c3 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,6 @@ "mikey179/vfsStream": "*" }, "require-dev": { - "EHER/PHPUnit": "*" + "phpunit/phpunit": "*" } }
\ No newline at end of file |