Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/53' into develop
Browse files Browse the repository at this point in the history
Forward port #53

Conflicts:
	CHANGELOG.md
  • Loading branch information
weierophinney committed Aug 10, 2016
2 parents c7d5f01 + 6f1561d commit 82f9a87
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse

- Nothing.

## 1.2.2 - TBD
## 1.2.2 - 2016-08-10

### Added

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

### Fixed

- Nothing.
- [#53](https://github.com/zfcampus/zf-apigility-documentation/pull/53) fixes an
import statement in the configuration file.

## 1.2.1 - 2016-08-04

Expand Down
2 changes: 1 addition & 1 deletion config/module.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace ZF\Apigility\Documentation;

use Zend\ServiceManager\Factory\InvokableFactory;
use Zend\View\Modle\ViewModel;
use Zend\View\Model\ViewModel;

return [
'router' => [
Expand Down

0 comments on commit 82f9a87

Please sign in to comment.