Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
thibaultmeyer committed Jul 5, 2016
2 parents dcf7e32 + 9a8a94c commit e0502a9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# S-Money API client


[![Latest release](https://img.shields.io/badge/latest_release-16.04-orange.svg)](https://github.com/payintech/smoney-java-client/releases)
[![Latest release](https://img.shields.io/badge/latest_release-16.07-orange.svg)](https://github.com/payintech/smoney-java-client/releases)
[![Build](https://img.shields.io/travis-ci/payintech/smoney-java-client.svg?branch=master&style=flat)](https://travis-ci.org/payintech/smoney-java-client)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/payintech/smoney-java-client/master/LICENSE)
[![Join the chat at https://gitter.im/payintech/smoney-java-client](https://badges.gitter.im/payintech/smoney-java-client.svg)](https://gitter.im/payintech/smoney-java-client?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Expand Down Expand Up @@ -63,7 +63,7 @@ the timeout value from 15 to a greater value.
### Gradle

dependencies {
compile 'com.payintech:s-money-client:16.04'
compile 'com.payintech:s-money-client:16.07'
}


Expand All @@ -72,13 +72,13 @@ the timeout value from 15 to a greater value.
<dependency>
<groupId>com.payintech</groupId>
<artifactId>s-money-client</artifactId>
<version>16.04</version>
<version>16.07</version>
</dependency>


### SBT

libraryDependencies += "com.payintech" % "s-money-client" % "16.04"
libraryDependencies += "com.payintech" % "s-money-client" % "16.07"



Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.payintech</groupId>
<artifactId>s-money-client</artifactId>
<version>16.05</version>
<version>16.07</version>
<packaging>jar</packaging>
<name>S-Money API Client</name>
<description>S-Money API client for Java and Android</description>
Expand Down

0 comments on commit e0502a9

Please sign in to comment.