Skip to content

Commit e903dbe

Browse files
authored
Merge pull request #3 from cherry-framework/develop
Develop
2 parents 835c23a + ceb1bd7 commit e903dbe

File tree

6 files changed

+38
-1548
lines changed

6 files changed

+38
-1548
lines changed

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# Cherry-framework Changelog
22

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

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

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

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

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

1416
- Project available on: `composer create-project cherry-project/framework`
15-
1617
- Include latest Cherry-Core version.

bin/console

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@ set_time_limit(0);
66
require __DIR__ . '/../vendor/autoload.php';
77

88
use Cherry\Console\Console;
9+
use Cherry\Kernel;
10+
11+
$app = new Kernel(dirname(__DIR__));
912

1013
$console = new Console();

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"minimum-stability": "dev",
1717
"require": {
1818
"php": ">=5.6.0",
19-
"cherry-project/core": "^1.0",
20-
"cherry-project/logs-viewer": "dev-master",
21-
"cherry-project/console": "dev-master"
19+
"cherry-project/core": "^1.5",
20+
"cherry-project/logs-viewer": "^1.0",
21+
"cherry-project/console": "^1.5"
2222
}
2323
}

0 commit comments

Comments
 (0)