Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
updating 1.5 label from dev to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmcassel
dmcassel committed Apr 18, 2014
1 parent d88cd9c commit 105c652
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.mdown
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ This file describes changes made to Roxy per release
* \#124 Fixed corb integration bug
* \#126 Don't overwrite application/custom when running "ml capture"

## 1.5 (branch: dev)
## 1.5 (branch: master)

### New Features
* \#26 Allow applications to share an XDBC port
Expand Down

0 comments on commit 105c652

Please sign in to comment.