Mike Rosseel ff00f8f7ad Merge branch 'issue544-api' of github.com:bitsquare/bitsquare into issue544-api ... Conflicts: api/src/main/java/io/bitsquare/api/BitsquareProxy.java		2016-10-10 07:39:35 +02:00
..
src/main	Merge branch 'issue544-api' of github.com:bitsquare/bitsquare into issue544-api	2016-10-10 07:39:35 +02:00
pom.xml	fix version + notes Manfred	2016-10-06 21:43:51 +02:00