Skip to content

Commit

Permalink
Merge pull request #1096 from wagnert/master
Browse files Browse the repository at this point in the history
Release 1.1.5
  • Loading branch information
wagnert committed Jun 5, 2018
2 parents d9844fe + cffb53c commit e1f76fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
Version 1.1.5

## Bugfixes

* None

## Features

* Release version 1.1.5

Version 1.1.5-beta12

## Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion build.default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
;--------------------------------------------------------------------------------

; ---- Module Release Settings --------------------------------------------------
release.version = 1.1.5-beta12
release.version = 1.1.5
release.name = Iron Knight

; ---- PHPCPD Settings ----------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"appserver-io/lang": "3.0.*",
"appserver-io/logger": "1.0.*",
"appserver-io/fastcgi" : "2.0.*",
"appserver-io/routlt": "2.2.0",
"appserver-io/routlt": "2.2.*",
"appserver-io/storage": "2.0.*",
"appserver-io/messaging": "3.0.*",
"appserver-io/microcron": "1.0.*",
Expand Down

0 comments on commit e1f76fd

Please sign in to comment.