diff options
| author | nodiscc <nodiscc@gmail.com> | 2015-06-23 14:38:43 +0200 |
|---|---|---|
| committer | nodiscc <nodiscc@gmail.com> | 2015-06-23 14:38:43 +0200 |
| commit | 38a0c256d200df872990f6ed450aceaf215eeafd (patch) | |
| tree | f6db984281ca44e6f9c763d78eb990b32be07b25 /composer.json | |
| parent | 0fe36414c86e8417974d847f8d6d28c90def9ccc (diff) | |
| parent | ca74886f30da323f42aa4bd70461003f46ef299b (diff) | |
| download | Shaarli-38a0c256d200df872990f6ed450aceaf215eeafd.tar.gz Shaarli-38a0c256d200df872990f6ed450aceaf215eeafd.tar.zst Shaarli-38a0c256d200df872990f6ed450aceaf215eeafd.zip | |
Merge remote-tracking branch 'virtualtam/test/link-db' into next
Conflicts:
index.php
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/composer.json b/composer.json index d1f613c1..f6d92c92 100644 --- a/composer.json +++ b/composer.json | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | "require": {}, | 8 | "require": {}, |
| 9 | "require-dev": { | 9 | "require-dev": { |
| 10 | "phpmd/phpmd" : "@stable", | 10 | "phpmd/phpmd" : "@stable", |
| 11 | "phpunit/phpunit": "4.6.*", | ||
| 11 | "sebastian/phpcpd": "*", | 12 | "sebastian/phpcpd": "*", |
| 12 | "squizlabs/php_codesniffer": "2.*" | 13 | "squizlabs/php_codesniffer": "2.*" |
| 13 | } | 14 | } |