Manfred Karrer ee9b133f65 Merge branch 'Development' ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java # gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java		2018-02-01 14:10:42 -05:00
..
src/main	Merge branch 'Development'	2018-02-01 14:10:42 -05:00
pom.xml	v0.6.5	2018-01-31 13:04:24 -05:00