Skip to content

Commit

Permalink
Merge branch 'master' into developing
Browse files Browse the repository at this point in the history
Conflicts:
	build.properties.json
  • Loading branch information
acenolaza committed May 27, 2015
2 parents 51d40ee + c7d0ee7 commit 3a3656c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# VersionOne Integration for JIRA

## Want to contribute?
If you are interested in contributing to this project, please contact [VersionOne openAgile Support](mailto:[email protected]).
If you are interested in contributing to this project, please contact [VersionOne openAgile Team](mailto:[email protected]).
5 changes: 3 additions & 2 deletions build.properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"configuration": "Release",
"platform": "Any CPU",
"organizationName": "VersionOne, Inc.",
"version" : "8.4.0.0"
}
"version" : "8.4.0.0",
"release" : "beta"
}

0 comments on commit 3a3656c

Please sign in to comment.