Skip to content

Commit

Permalink
Merge pull request #3 from cherry-framework/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ABGEO authored Apr 21, 2019
2 parents 835c23a + ceb1bd7 commit e903dbe
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 1,548 deletions.
9 changes: 5 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# Cherry-framework Changelog

## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v.0.0") (2019-04-08)
## [v2.1.0](https://github.com/cherry-framework/framework/releases/tag/v2.1.0 "v2.1.0") (2019-04-21)

- Add Bootstrap template to sample page.
- Update Cherry Core and Console versions;

- Add Cherry [Logs Viewer](https://github.com/cherry-framework/logs-viewer).
## [v2.0.0](https://github.com/cherry-framework/framework/releases/tag/v2.0.0 "v2.0.0") (2019-04-08)

- Add Bootstrap template to sample page.
- Add Cherry [Logs Viewer](https://github.com/cherry-framework/logs-viewer).
- Add Cherry [Console](https://github.com/cherry-framework/console).

## [v1.0.0](https://github.com/cherry-framework/framework/releases/tag/v1.0.0 "v1.0.0") (2019-03-29)
#### The first stable version

- Project available on: `composer create-project cherry-project/framework`

- Include latest Cherry-Core version.
3 changes: 3 additions & 0 deletions bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@ set_time_limit(0);
require __DIR__ . '/../vendor/autoload.php';

use Cherry\Console\Console;
use Cherry\Kernel;

$app = new Kernel(dirname(__DIR__));

$console = new Console();
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"minimum-stability": "dev",
"require": {
"php": ">=5.6.0",
"cherry-project/core": "^1.0",
"cherry-project/logs-viewer": "dev-master",
"cherry-project/console": "dev-master"
"cherry-project/core": "^1.5",
"cherry-project/logs-viewer": "^1.0",
"cherry-project/console": "^1.5"
}
}
Loading

0 comments on commit e903dbe

Please sign in to comment.