Manfred Karrer 7261041cb7 Merge branch 'ripcurlx-feature/clean-up-css' into UI-improvements ... # Conflicts: # gui/src/main/java/io/bisq/gui/bisq.css		2017-12-21 00:23:16 +01:00
..
src	Merge branch 'ripcurlx-feature/clean-up-css' into UI-improvements	2017-12-21 00:23:16 +01:00
pom.xml	Remove exclusion of bouncycastle in pom.	2017-12-20 00:49:01 +01:00