Christoph Atteneder f3b638078b Merge branch 'UI-improvements' into feature/show-tooltip-if-truncated ... # Conflicts: # gui/src/main/java/io/bisq/gui/components/HyperlinkWithIcon.java # gui/src/main/java/io/bisq/gui/main/market/offerbook/OfferBookChartView.java		2017-12-21 10:12:30 +01:00
..
src	Merge branch 'UI-improvements' into feature/show-tooltip-if-truncated	2017-12-21 10:12:30 +01:00
pom.xml	Remove exclusion of bouncycastle in pom.	2017-12-20 00:49:01 +01:00