tonyair/silverstripe-testsession
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-testsession synced 2024-10-22 14:06:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.1'

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-06-04 15:01:30 +02:00
commit bded32a90b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_config.php
View File

@ -1,5 +1,8 @@
<?php <?php
if(DB::get_alternative_database_name()) { if(
Config::inst()->get('Security', 'token')
&& DB::get_alternative_database_name()
) {
require_once BASE_PATH . '/vendor/autoload.php'; require_once BASE_PATH . '/vendor/autoload.php';
// Register mailer // Register mailer

2
composer.json
View File

@ -18,4 +18,4 @@
"silverstripe/behat-extension": "*" "silverstripe/behat-extension": "*"
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }