Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-kuendig committed Feb 13, 2018
2 parents 9578cee + 068de94 commit 36450e6
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 20 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"cypresslab/gitelephant": "~1.1",
"symfony/console": "~2.7|~3.0",
"symfony/process": "~2.7|~3.0",
"symfony/filessystem": "~2.7|~3.0",
"symfony/filesystem": "~2.7|~3.0",
"symfony/yaml": "~2.1|~3.0"
},
"bin": [
Expand Down
140 changes: 122 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion october
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
require __DIR__.'/vendor/autoload.php';
}

$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.22');
$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.23');
$app->add(new \OFFLINE\Bootstrapper\October\Console\InitCommand);
$app->add(new \OFFLINE\Bootstrapper\October\Console\InstallCommand);
$app->run();

0 comments on commit 36450e6

Please sign in to comment.