Merge remote-tracking branch 'upstream/master'

Conflicts:
	bridges/Sexactu.php
This commit is contained in:
unknown 2015-04-06 14:52:04 +02:00
commit a5f52b8789
100 changed files with 6776 additions and 158 deletions

View file

@ -137,7 +137,7 @@ class Bridge{
$listBridge = array();
$searchCommonPattern = array('description', 'name');
$searchCommonPattern = array('maintainer', 'description', 'homepage', 'name');
$dirFiles = scandir($pathDirBridge);
if( $dirFiles !== false ){
@ -184,4 +184,4 @@ class Bridge{
return $listBridge;
}
}
}