Merge branch '1.0' into 2.0

* 1.0:
  Adjust sami.conf.php to new branch names.
This commit is contained in:
Andreas Fischer 2015-02-04 18:16:50 +01:00
commit eca3bb9724
1 changed files with 2 additions and 1 deletions

View File

@ -16,8 +16,9 @@ $iterator = Symfony\Component\Finder\Finder::create()
;
$versions = Sami\Version\GitVersionCollection::create(__DIR__ . '/../')
->add('1.0')
->add('2.0')
->add('master')
->add('php5')
;
return new Sami\Sami($iterator, array(