Manfred Karrer b9dfa0a7a7 Merge branch 'master' into Development ... # Conflicts: # common/pom.xml # common/src/main/java/io/bitsquare/app/Version.java # core/pom.xml # core/src/main/java/io/bitsquare/locale/CurrencyUtil.java # gui/pom.xml # jsocks/pom.xml # jtorctl/pom.xml # jtorproxy/pom.xml # network/pom.xml # package/linux/create_32bit_app.sh # package/linux/create_64bit_app.sh # package/mac/create_app.sh # package/windows/Bitsquare.iss # package/windows/create_32bit_app.bat # package/windows/create_app.bat # pom.xml # seednode/pom.xml		2016-05-05 13:30:18 +02:00
..
src	Merge branch 'master' into Development	2016-05-05 13:30:18 +02:00
pom.xml	v0.4.6	2016-04-29 11:22:58 +02:00