Skip to content

Commit

Permalink
Merge branch 'develop' into dev-4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra committed Mar 29, 2020
2 parents 3d1e157 + daa24ba commit 4733ad5
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/docs/ export-ignore
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
repository_dispatch:
types: docs-build

jobs:
build-deploy:
Expand Down
28 changes: 26 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 3.2.2 - TBD
## 3.2.3 - TBD

### Added

Expand All @@ -66,7 +66,31 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- [#8](https://github.com/laminas/laminas-json-server/pull/8) fixes fluent interface on `Smd::setDescription()`.
- Nothing.

## 3.2.2 - 2020-03-29

### Added

- Nothing.

### Changed

- Nothing.

### Deprecated

- Nothing.

### Removed

- Nothing.

### Fixed

- [#8](https://github.com/laminas/laminas-json-server/pull/8) fixes fluent interface on `Smd::setDescription()`.

- Fixed `replace` version constraint in composer.json so repository can be used as replacement of `zendframework/zend-json-server:^3.2.0`.

## 3.2.1 - 2020-01-16

Expand Down
3 changes: 0 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,5 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"replace": {
"zendframework/zend-json-server": "self.version"
}
}

0 comments on commit 4733ad5

Please sign in to comment.