diff options
| author | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
|---|---|---|
| committer | Eole <EoleDev@outlook.fr> | 2016-04-27 16:42:28 +0200 |
| commit | 49f416dc5061032e0514ea0cfeceaca37d13e432 (patch) | |
| tree | 1202ac2a6fa860b8929afdc886c94fc50bd0a1de /server/vendor/guzzlehttp/promises/phpunit.xml.dist | |
| parent | c7edd70b5e5b0f5159c78ce3d924d4e7f60db816 (diff) | |
| parent | c9202d9113210981ae47df40511645da2ee140df (diff) | |
Merge branch 'develop' into Eole_Graph
Conflicts:
client/index.html
client/js/controllers/home/home.js
client/partials/home/home.html
Diffstat (limited to 'server/vendor/guzzlehttp/promises/phpunit.xml.dist')
| -rw-r--r-- | server/vendor/guzzlehttp/promises/phpunit.xml.dist | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/server/vendor/guzzlehttp/promises/phpunit.xml.dist b/server/vendor/guzzlehttp/promises/phpunit.xml.dist deleted file mode 100644 index 500cd53..0000000 --- a/server/vendor/guzzlehttp/promises/phpunit.xml.dist +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<phpunit bootstrap="./tests/bootstrap.php" - colors="true"> - <testsuites> - <testsuite> - <directory>tests</directory> - </testsuite> - </testsuites> - <filter> - <whitelist> - <directory suffix=".php">src</directory> - <exclude> - <directory suffix="Interface.php">src/</directory> - </exclude> - </whitelist> - </filter> -</phpunit> |