diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-22 15:56:51 +0200 |
| commit | 273cc47ae496f74a482ab47b305537a3fa1925f7 (patch) | |
| tree | 86843e04095b6e210ee6837fcf23f5d551ee3932 /composer.json | |
| parent | f83c4363b5459d294255e3817a230258861ec79b (diff) | |
| parent | 3fb026713013b60845c4cfe633a8a59a30b9c7dd (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/db_qb_aliasing
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 |