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

Commit

Permalink
merge(release): resolve the conflict due to release client-3.9.0
Browse files Browse the repository at this point in the history
Merge branch 'release'

Conflicts:
	pom.xml
	stub-server/pom.xml
	zanata-cli/pom.xml
	zanata-client-commands/pom.xml
	zanata-maven-plugin/pom.xml
	zanata-rest-client/pom.xml
  • Loading branch information
definite committed May 12, 2016
2 parents 75d8f58 + b616a65 commit c8748bf
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 3.9.0

##### Changes
* [ZNTA-1028](https://zanata.atlassian.net/browse/ZNTA-1028) - Refactor QualifiedSrcDocName and UnqualifiedSrcDocName

-----------------------

## 3.8.4

##### Bug fixes
Expand Down

0 comments on commit c8748bf

Please sign in to comment.