Skip to content

Commit 8a1ec73

Browse files
committed
Merge branch 'develop'
2 parents 0cf34ce + a40e92b commit 8a1ec73

File tree

2 files changed

+25
-7
lines changed

2 files changed

+25
-7
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 1.0.0 - 2018-05-14
2+
3+
### Changed
4+
* updated dependencies
5+
6+
### Added
7+
* Nothing
8+
9+
### Deprecated
10+
* Nothing
11+
12+
### Removed
13+
* Nothing
14+
15+
### Fixed
16+
* Nothing
17+
18+
119
## 0.2.1 - 2017-04-21
220

321
### Changed

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"license": "MIT",
66
"authors": [
77
{
8-
"name": "n3vrax",
9-
"email": "tibi@apidemia.com"
8+
"name": "DotKernel Team",
9+
"email": "team@dotkernel.com"
1010
}
1111
],
1212
"require": {
1313
"php": "^7.1",
14-
"zendframework/zend-servicemanager": "^3.3.0",
15-
"dotkernel/dot-controller": "^0.3",
16-
"dotkernel/dot-flashmessenger": "^0.2"
14+
"zendframework/zend-servicemanager": "^3.3",
15+
"dotkernel/dot-controller": "^1.0",
16+
"dotkernel/dot-flashmessenger": "^1.0"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "^4.8",
@@ -31,8 +31,8 @@
3131
},
3232
"extra": {
3333
"branch-alias": {
34-
"dev-master": "0.2-dev",
35-
"dev-develop": "0.3-dev"
34+
"dev-master": "1.0-dev",
35+
"dev-develop": "1.1-dev"
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)