diff options
| author | Eric Roberts <eric@cryode.com> | 2012-12-12 14:02:11 +0100 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-12-12 14:02:11 +0100 |
| commit | b9e35f21e1c70b6aa67c47e9244ed83195abc00a (patch) | |
| tree | 64f82db362deeac48cc20d1d1afd80651f36f5a5 /composer.json | |
| parent | 0b05705c52c3bca7f9b3aee657c888e8ad1ff422 (diff) | |
| parent | 545a7c86701875e1412bcde316e9bcc76d9a23a0 (diff) | |
Merge branch 'refs/heads/develop' into feature/form_error_msgs
Conflicts:
system/language/english/form_validation_lang.php
user_guide_src/source/libraries/form_validation.rst
Signed-off-by: Eric Roberts <eric@cryode.com>
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/composer.json b/composer.json new file mode 100644 index 000000000..7d60020c3 --- /dev/null +++ b/composer.json @@ -0,0 +1,8 @@ +{ + "require": { + "mikey179/vfsStream": "*" + }, + "require-dev": { + "phpunit/phpunit": "*" + } +}
\ No newline at end of file |