tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge 3 into master

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2016-05-11 14:33:39 +12:00
commit 1a5652d81c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -11,6 +11,7 @@
"silverstripe/asset-admin": "^1"
},
"require-dev": {
"ext-tidy": "*",
"phpunit/PHPUnit": "~4.8"
},
"extra": {

1
phpunit.xml.dist
View File

@ -22,6 +22,7 @@
<directory>mysite/tests</directory>
<directory>cms/tests</directory>
<directory>framework/tests</directory>
<directory>framework/admin/tests</directory>
</testsuite>
<listeners>